diff --git a/Generator/JavaTypeWriters/JavaClassWriter.cs b/Generator/JavaTypeWriters/JavaClassWriter.cs
index d19723ea..729f0032 100644
--- a/Generator/JavaTypeWriters/JavaClassWriter.cs
+++ b/Generator/JavaTypeWriters/JavaClassWriter.cs
@@ -1,22 +1,13 @@
 using Generator.Extensions;
 using MessagePack;
 using Newtonsoft.Json;
-using Relewise.Client.Responses;
-using System;
 using System.CodeDom.Compiler;
 using System.Reflection;
 
 namespace Generator.JavaTypeWriters;
 
-public class JavaClassWriter : IJavaTypeWriter
+public class JavaClassWriter(JavaWriter javaWriter) : IJavaTypeWriter
 {
-    private readonly JavaWriter javaWriter;
-
-    public JavaClassWriter(JavaWriter javaWriter)
-    {
-        this.javaWriter = javaWriter;
-    }
-
     public bool CanWrite(Type type) => IsClass(type) || IsAnyStruct(type);
 
     private bool IsClass(Type type) => type.IsClass;
@@ -81,7 +72,7 @@ public void Write(IndentedTextWriter writer, Type type, string typeName)
             baseTypeName = javaWriter.TypeName(baseType).RemoveNullable();
         }
 
-        writer.WriteLine($"public {(type.IsAbstract ? "abstract " : "")}class {typeName}{(baseTypeName is not null ? $" extends {baseTypeName}" : "")}{(type.GetInterfaces() is { Length: > 0 } interfaces ? " implements " + string.Join(", ", interfaces.Select(i => javaWriter.TypeName(i))) : "")}");
+        writer.WriteLine($"public {(type.IsAbstract ? "abstract " : "")}class {typeName}{(baseTypeName is not null ? $" extends {baseTypeName}" : "")}{(type.GetInterfaces().Where(x => x.IsPublic).ToArray() is { Length: > 0 } interfaces ? " implements " + string.Join(", ", interfaces.Select(i => javaWriter.TypeName(i))) : "")}");
         writer.WriteLine("{");
         writer.Indent++;
         if (type.IsMaybeBaseClassOfSomethingPolymorphic())
diff --git a/Generator/JavaWriter.cs b/Generator/JavaWriter.cs
index c3b84cfd..4e95f16b 100644
--- a/Generator/JavaWriter.cs
+++ b/Generator/JavaWriter.cs
@@ -8,12 +8,13 @@ namespace Generator;
 
 public class JavaWriter
 {
-    private readonly List<IJavaTypeWriter> javaTypeWriters;
-    private readonly JavaTypeResolver javaTypeResolver;
+    private readonly List<IJavaTypeWriter> _javaTypeWriters;
+    private readonly JavaTypeResolver _javaTypeResolver;
 
     public HashSet<Type> MissingTypeDefinitions { get; set; } = new();
     public Assembly Assembly { get; }
     public string BasePath { get; }
+    private string ModelsPath { get; }
     public XmlDocumentation XmlDocumentation { get; }
     public JavaCreatorMethodWriter CreatorMethodWriter { get; }
     public JavaPropertyGetterMethodsWriter PropertyGetterMethodsWriter { get; }
@@ -21,12 +22,21 @@ public class JavaWriter
     public JavaStaticReadonlyPropertiesWriter StaticReadonlyPropertiesWriter { get; }
     public JavaFieldWriter SettablePropertiesWriter { get; }
 
+    public void ClearFolder()
+    {
+        if (Directory.Exists(ModelsPath))
+            new DirectoryInfo(ModelsPath).Delete(true);
+
+        Directory.CreateDirectory(ModelsPath);
+    }
+
     public JavaWriter(Assembly assembly, string basePath, XmlDocumentation xmlDocumentation)
     {
-        javaTypeWriters = new List<IJavaTypeWriter>() { new JavaKeyValuePairWriter(this), new JavaEnumWriter(this), new JavaInterfaceWriter(this), new JavaClassWriter(this) };
-        javaTypeResolver = new JavaTypeResolver(assembly);
+        _javaTypeWriters = new List<IJavaTypeWriter> { new JavaKeyValuePairWriter(this), new JavaEnumWriter(this), new JavaInterfaceWriter(this), new JavaClassWriter(this) };
+        _javaTypeResolver = new JavaTypeResolver(assembly);
         Assembly = assembly;
         BasePath = basePath;
+        ModelsPath = $"{BasePath}/{Constants.GenerationFolderPath}/";
         XmlDocumentation = xmlDocumentation;
         CreatorMethodWriter = new JavaCreatorMethodWriter(this);
         PropertyGetterMethodsWriter = new JavaPropertyGetterMethodsWriter(this);
@@ -39,12 +49,12 @@ public void WriteTypes(IEnumerable<Type> types)
     {
         foreach (var type in types)
         {
-            javaTypeResolver.TypesToGenerate.Enqueue(type);
+            _javaTypeResolver.TypesToGenerate.Enqueue(type);
         }
 
-        while (javaTypeResolver.TypesToGenerate.Count > 0)
+        while (_javaTypeResolver.TypesToGenerate.Count > 0)
         {
-            var type = javaTypeResolver.TypesToGenerate.Dequeue();
+            var type = _javaTypeResolver.TypesToGenerate.Dequeue();
 
             if (type == typeof(object) || type == typeof(ValueType) || type == typeof(Enum))
                 continue;
@@ -52,17 +62,17 @@ public void WriteTypes(IEnumerable<Type> types)
             var potentialNullableTypeName = TypeName(type);
             string typeName = potentialNullableTypeName.RemoveNullable();
 
-            if (javaTypeResolver.IsWritten(typeName)) continue;
+            if (_javaTypeResolver.IsWritten(typeName)) continue;
 
             if (type.IsGenericTypeDefinition || type.IsGenericTypeParameter || typeName.Contains("d__"))
             {
                 continue;
             }
 
-            using var streamWriter = File.CreateText($"{BasePath}/{Constants.GenerationFolderPath}/{typeName}.java");
+            using var streamWriter = File.CreateText($"{ModelsPath}{typeName}.java");
             using var writer = new IndentedTextWriter(streamWriter);
 
-            var javaTypeWriter = javaTypeWriters.FirstOrDefault(writer => writer.CanWrite(type));
+            var javaTypeWriter = _javaTypeWriters.FirstOrDefault(w => w.CanWrite(type));
             if (javaTypeWriter is null)
             {
                 MissingTypeDefinitions.Add(type);
@@ -70,12 +80,12 @@ public void WriteTypes(IEnumerable<Type> types)
             else
             {
                 javaTypeWriter.Write(writer, type, typeName);
-                javaTypeResolver.HasWritten(typeName);
+                _javaTypeResolver.HasWritten(typeName);
             }
         }
     }
 
-    public string TypeName(Type type) => javaTypeResolver.ResolveType(type);
+    public string TypeName(Type type) => _javaTypeResolver.ResolveType(type);
 
     public string TypeName(PropertyInfo property)
     {
diff --git a/Generator/Program.cs b/Generator/Program.cs
index d0c84b54..fd1197ff 100644
--- a/Generator/Program.cs
+++ b/Generator/Program.cs
@@ -25,6 +25,8 @@
 
 var javaWriter = new JavaWriter(assembly, basePath, xmlDocumentation);
 
+javaWriter.ClearFolder();
+
 javaWriter.WriteTypes(assembly
     .GetTypes()
     .Where(type => type.IsSubclassOf(typeof(LicensedRequest))));
diff --git a/src/src/main/java/com/relewise/client/model/AnalyzerRequest.java b/src/src/main/java/com/relewise/client/model/AnalyzerRequest.java
index d8aa71de..9a75fd51 100644
--- a/src/src/main/java/com/relewise/client/model/AnalyzerRequest.java
+++ b/src/src/main/java/com/relewise/client/model/AnalyzerRequest.java
@@ -23,7 +23,7 @@
     @JsonSubTypes.Type(value = ProductPerformanceRequest.class, name = "Relewise.Client.Requests.Analyzers.ProductPerformanceRequest, Relewise.Client"),
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class AnalyzerRequest extends LicensedRequest implements IHaveCurrencyLanguage
+public abstract class AnalyzerRequest extends LicensedRequest
 {
     public String $type = "";
     public @Nullable Language language;
diff --git a/src/src/main/java/com/relewise/client/model/BrandAdministrativeAction.java b/src/src/main/java/com/relewise/client/model/BrandAdministrativeAction.java
index 86b87068..687af126 100644
--- a/src/src/main/java/com/relewise/client/model/BrandAdministrativeAction.java
+++ b/src/src/main/java/com/relewise/client/model/BrandAdministrativeAction.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = BrandAdministrativeAction.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class BrandAdministrativeAction extends Trackable implements IHaveCurrencyLanguage
+public class BrandAdministrativeAction extends Trackable
 {
     public String $type = "Relewise.Client.DataTypes.BrandAdministrativeAction, Relewise.Client";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/BrandDataFilter.java b/src/src/main/java/com/relewise/client/model/BrandDataFilter.java
index 806b694d..cf2b4ce8 100644
--- a/src/src/main/java/com/relewise/client/model/BrandDataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/BrandDataFilter.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = BrandDataFilter.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class BrandDataFilter extends DataFilter implements IHaveCurrencyLanguage, IBrandFilter
+public class BrandDataFilter extends DataFilter implements IBrandFilter
 {
     public String $type = "Relewise.Client.Requests.Filters.BrandDataFilter, Relewise.Client";
     public static BrandDataFilter create(String key, String... objectPath)
diff --git a/src/src/main/java/com/relewise/client/model/BrandQuery.java b/src/src/main/java/com/relewise/client/model/BrandQuery.java
index 1ab16daa..9ce7d9c4 100644
--- a/src/src/main/java/com/relewise/client/model/BrandQuery.java
+++ b/src/src/main/java/com/relewise/client/model/BrandQuery.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = BrandQuery.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class BrandQuery extends LicensedRequest implements IHaveCurrencyLanguage
+public class BrandQuery extends LicensedRequest
 {
     public String $type = "Relewise.Client.Requests.Queries.BrandQuery, Relewise.Client";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/BrandRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/BrandRecommendationRequest.java
index 6c601065..d912e02b 100644
--- a/src/src/main/java/com/relewise/client/model/BrandRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/BrandRecommendationRequest.java
@@ -24,7 +24,7 @@
     @JsonSubTypes.Type(value = PersonalBrandRecommendationRequest.class, name = "Relewise.Client.Requests.Recommendations.PersonalBrandRecommendationRequest, Relewise.Client"),
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class BrandRecommendationRequest extends RecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public abstract class BrandRecommendationRequest extends RecommendationRequest implements IUserIdentifier
 {
     public String $type = "";
     public BrandRecommendationRequestSettings settings;
diff --git a/src/src/main/java/com/relewise/client/model/CartDataFilter.java b/src/src/main/java/com/relewise/client/model/CartDataFilter.java
index e24c44c4..4cce304d 100644
--- a/src/src/main/java/com/relewise/client/model/CartDataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/CartDataFilter.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = CartDataFilter.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CartDataFilter extends Filter implements IHaveCurrencyLanguage
+public class CartDataFilter extends Filter
 {
     public String $type = "Relewise.Client.Requests.Filters.CartDataFilter, Relewise.Client";
     public String key;
diff --git a/src/src/main/java/com/relewise/client/model/CategoryAdministrativeAction.java b/src/src/main/java/com/relewise/client/model/CategoryAdministrativeAction.java
index 60ae24d2..7bc80fc7 100644
--- a/src/src/main/java/com/relewise/client/model/CategoryAdministrativeAction.java
+++ b/src/src/main/java/com/relewise/client/model/CategoryAdministrativeAction.java
@@ -22,7 +22,7 @@
 @JsonSubTypes({
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class CategoryAdministrativeAction extends Trackable implements IHaveCurrencyLanguage
+public abstract class CategoryAdministrativeAction extends Trackable
 {
     public String $type = "";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/CompanyAdministrativeAction.java b/src/src/main/java/com/relewise/client/model/CompanyAdministrativeAction.java
index 4524a036..b242e424 100644
--- a/src/src/main/java/com/relewise/client/model/CompanyAdministrativeAction.java
+++ b/src/src/main/java/com/relewise/client/model/CompanyAdministrativeAction.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = CompanyAdministrativeAction.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CompanyAdministrativeAction extends Trackable implements IHaveCurrencyLanguage
+public class CompanyAdministrativeAction extends Trackable
 {
     public String $type = "Relewise.Client.DataTypes.CompanyAdministrativeAction, Relewise.Client";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/CompanyDataFilter.java b/src/src/main/java/com/relewise/client/model/CompanyDataFilter.java
index 68506e5e..fc37eb62 100644
--- a/src/src/main/java/com/relewise/client/model/CompanyDataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/CompanyDataFilter.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = CompanyDataFilter.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CompanyDataFilter extends DataFilter implements IHaveCurrencyLanguage, ICompanyFilter
+public class CompanyDataFilter extends DataFilter implements ICompanyFilter
 {
     public String $type = "Relewise.Client.Requests.Filters.CompanyDataFilter, Relewise.Client";
     public static CompanyDataFilter create(String key, String... objectPath)
diff --git a/src/src/main/java/com/relewise/client/model/ContentAdministrativeAction.java b/src/src/main/java/com/relewise/client/model/ContentAdministrativeAction.java
index 945bd243..79f6910d 100644
--- a/src/src/main/java/com/relewise/client/model/ContentAdministrativeAction.java
+++ b/src/src/main/java/com/relewise/client/model/ContentAdministrativeAction.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentAdministrativeAction.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentAdministrativeAction extends Trackable implements IHaveCurrencyLanguage
+public class ContentAdministrativeAction extends Trackable
 {
     public String $type = "Relewise.Client.DataTypes.ContentAdministrativeAction, Relewise.Client";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/ContentCategoryAdministrativeAction.java b/src/src/main/java/com/relewise/client/model/ContentCategoryAdministrativeAction.java
index 7ee697c4..477d6ab8 100644
--- a/src/src/main/java/com/relewise/client/model/ContentCategoryAdministrativeAction.java
+++ b/src/src/main/java/com/relewise/client/model/ContentCategoryAdministrativeAction.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentCategoryAdministrativeAction.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentCategoryAdministrativeAction extends CategoryAdministrativeAction implements IHaveCurrencyLanguage
+public class ContentCategoryAdministrativeAction extends CategoryAdministrativeAction
 {
     public String $type = "Relewise.Client.DataTypes.ContentCategoryAdministrativeAction, Relewise.Client";
     public static ContentCategoryAdministrativeAction create(@Nullable Language language, @Nullable Currency currency, FilterCollection filters, CategoryAdministrativeActionUpdateKind kind)
diff --git a/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java b/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java
index 34507b0a..9036cec1 100644
--- a/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/ContentCategoryDataFilter.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentCategoryDataFilter.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentCategoryDataFilter extends DataFilter implements IHaveCurrencyLanguage, IContentCategoryFilter, ICategoryFilter
+public class ContentCategoryDataFilter extends DataFilter implements IContentCategoryFilter, ICategoryFilter
 {
     public String $type = "Relewise.Client.Requests.Filters.ContentCategoryDataFilter, Relewise.Client";
     public static ContentCategoryDataFilter create(String key, String... objectPath)
diff --git a/src/src/main/java/com/relewise/client/model/ContentCategoryIdFilterCategoryQuery.java b/src/src/main/java/com/relewise/client/model/ContentCategoryIdFilterCategoryQuery.java
index 3a17228f..688f1f1c 100644
--- a/src/src/main/java/com/relewise/client/model/ContentCategoryIdFilterCategoryQuery.java
+++ b/src/src/main/java/com/relewise/client/model/ContentCategoryIdFilterCategoryQuery.java
@@ -22,7 +22,7 @@
 @JsonSubTypes({
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class ContentCategoryIdFilterCategoryQuery extends LicensedRequest implements IHaveCurrencyLanguage
+public abstract class ContentCategoryIdFilterCategoryQuery extends LicensedRequest
 {
     public String $type = "";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/ContentCategoryQuery.java b/src/src/main/java/com/relewise/client/model/ContentCategoryQuery.java
index 7a6e87d4..91c7ceca 100644
--- a/src/src/main/java/com/relewise/client/model/ContentCategoryQuery.java
+++ b/src/src/main/java/com/relewise/client/model/ContentCategoryQuery.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentCategoryQuery.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentCategoryQuery extends ContentCategoryIdFilterCategoryQuery implements IHaveCurrencyLanguage
+public class ContentCategoryQuery extends ContentCategoryIdFilterCategoryQuery
 {
     public String $type = "Relewise.Client.Requests.Queries.ContentCategoryQuery, Relewise.Client";
     public static ContentCategoryQuery create()
diff --git a/src/src/main/java/com/relewise/client/model/ContentCategoryRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/ContentCategoryRecommendationRequest.java
index ca15cfa6..1a193b70 100644
--- a/src/src/main/java/com/relewise/client/model/ContentCategoryRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ContentCategoryRecommendationRequest.java
@@ -24,7 +24,7 @@
     @JsonSubTypes.Type(value = PersonalContentCategoryRecommendationRequest.class, name = "Relewise.Client.Requests.Recommendations.PersonalContentCategoryRecommendationRequest, Relewise.Client"),
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class ContentCategoryRecommendationRequest extends RecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public abstract class ContentCategoryRecommendationRequest extends RecommendationRequest implements IUserIdentifier
 {
     public String $type = "";
     public ContentCategoryRecommendationRequestSettings settings;
diff --git a/src/src/main/java/com/relewise/client/model/ContentCategorySearchRequest.java b/src/src/main/java/com/relewise/client/model/ContentCategorySearchRequest.java
index 08e5c751..0fa7211f 100644
--- a/src/src/main/java/com/relewise/client/model/ContentCategorySearchRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ContentCategorySearchRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentCategorySearchRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentCategorySearchRequest extends PaginatedSearchRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ContentCategorySearchRequest extends PaginatedSearchRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Search.ContentCategorySearchRequest, Relewise.Client";
     public String term;
diff --git a/src/src/main/java/com/relewise/client/model/ContentDataFilter.java b/src/src/main/java/com/relewise/client/model/ContentDataFilter.java
index daf270d6..e6afee95 100644
--- a/src/src/main/java/com/relewise/client/model/ContentDataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/ContentDataFilter.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentDataFilter.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentDataFilter extends DataFilter implements IHaveCurrencyLanguage, IContentFilter
+public class ContentDataFilter extends DataFilter implements IContentFilter
 {
     public String $type = "Relewise.Client.Requests.Filters.ContentDataFilter, Relewise.Client";
     public static ContentDataFilter create(String key, String... objectPath)
diff --git a/src/src/main/java/com/relewise/client/model/ContentQuery.java b/src/src/main/java/com/relewise/client/model/ContentQuery.java
index 80d6b5e6..5f21473d 100644
--- a/src/src/main/java/com/relewise/client/model/ContentQuery.java
+++ b/src/src/main/java/com/relewise/client/model/ContentQuery.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentQuery.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentQuery extends LicensedRequest implements IHaveCurrencyLanguage
+public class ContentQuery extends LicensedRequest
 {
     public String $type = "Relewise.Client.Requests.Queries.ContentQuery, Relewise.Client";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/ContentRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/ContentRecommendationRequest.java
index df98cc90..912a410b 100644
--- a/src/src/main/java/com/relewise/client/model/ContentRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ContentRecommendationRequest.java
@@ -28,7 +28,7 @@
     @JsonSubTypes.Type(value = ContentsViewedAfterViewingMultipleContentsRequest.class, name = "Relewise.Client.Requests.Recommendations.ContentsViewedAfterViewingMultipleContentsRequest, Relewise.Client"),
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class ContentRecommendationRequest extends RecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public abstract class ContentRecommendationRequest extends RecommendationRequest implements IUserIdentifier
 {
     public String $type = "";
     public ContentRecommendationRequestSettings settings;
diff --git a/src/src/main/java/com/relewise/client/model/ContentSearchRequest.java b/src/src/main/java/com/relewise/client/model/ContentSearchRequest.java
index 492fbe10..2263aebb 100644
--- a/src/src/main/java/com/relewise/client/model/ContentSearchRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ContentSearchRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentSearchRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentSearchRequest extends PaginatedSearchRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ContentSearchRequest extends PaginatedSearchRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Search.ContentSearchRequest, Relewise.Client";
     public @Nullable String term;
diff --git a/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingContentRequest.java b/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingContentRequest.java
index 5229bc6b..64b11965 100644
--- a/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingContentRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingContentRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentsViewedAfterViewingContentRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentsViewedAfterViewingContentRequest extends ContentRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ContentsViewedAfterViewingContentRequest extends ContentRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.ContentsViewedAfterViewingContentRequest, Relewise.Client";
     public String contentId;
diff --git a/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingMultipleContentsRequest.java b/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingMultipleContentsRequest.java
index 47637f04..c57ef697 100644
--- a/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingMultipleContentsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingMultipleContentsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentsViewedAfterViewingMultipleContentsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentsViewedAfterViewingMultipleContentsRequest extends ContentRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ContentsViewedAfterViewingMultipleContentsRequest extends ContentRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.ContentsViewedAfterViewingMultipleContentsRequest, Relewise.Client";
     public String[] contentIds;
diff --git a/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingMultipleProductsRequest.java b/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingMultipleProductsRequest.java
index 2f608dd6..9d087191 100644
--- a/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingMultipleProductsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingMultipleProductsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentsViewedAfterViewingMultipleProductsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentsViewedAfterViewingMultipleProductsRequest extends ContentRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ContentsViewedAfterViewingMultipleProductsRequest extends ContentRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.ContentsViewedAfterViewingMultipleProductsRequest, Relewise.Client";
     public ProductAndVariantId[] productAndVariantIds;
diff --git a/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingProductRequest.java b/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingProductRequest.java
index 199b0208..f3d7904a 100644
--- a/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingProductRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ContentsViewedAfterViewingProductRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ContentsViewedAfterViewingProductRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ContentsViewedAfterViewingProductRequest extends ContentRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ContentsViewedAfterViewingProductRequest extends ContentRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.ContentsViewedAfterViewingProductRequest, Relewise.Client";
     public ProductAndVariantId productAndVariantId;
diff --git a/src/src/main/java/com/relewise/client/model/CustomProductRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/CustomProductRecommendationRequest.java
index 069424c8..ef29da08 100644
--- a/src/src/main/java/com/relewise/client/model/CustomProductRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/CustomProductRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = CustomProductRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CustomProductRecommendationRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class CustomProductRecommendationRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.CustomProductRecommendationRequest, Relewise.Client";
     public String recommendationType;
diff --git a/src/src/main/java/com/relewise/client/model/DataFilter.java b/src/src/main/java/com/relewise/client/model/DataFilter.java
index 77333ea0..939d4141 100644
--- a/src/src/main/java/com/relewise/client/model/DataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/DataFilter.java
@@ -22,7 +22,7 @@
 @JsonSubTypes({
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class DataFilter extends Filter implements IHaveCurrencyLanguage
+public abstract class DataFilter extends Filter
 {
     public String $type = "";
     public String key;
diff --git a/src/src/main/java/com/relewise/client/model/IHaveCurrencyLanguage.java b/src/src/main/java/com/relewise/client/model/IHaveCurrencyLanguage.java
deleted file mode 100644
index fef4c7b6..00000000
--- a/src/src/main/java/com/relewise/client/model/IHaveCurrencyLanguage.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.relewise.client.model;
-
-import com.fasterxml.jackson.annotation.*;
-import javax.annotation.Nullable;
-import java.io.IOException;
-import java.time.Duration;
-import java.time.OffsetDateTime;
-import java.time.LocalDateTime;
-import java.util.Objects;
-import java.util.Arrays;
-import java.util.UUID;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
-
-public interface IHaveCurrencyLanguage
-{
-}
diff --git a/src/src/main/java/com/relewise/client/model/PaginatedSearchRequest.java b/src/src/main/java/com/relewise/client/model/PaginatedSearchRequest.java
index a666fff9..84480187 100644
--- a/src/src/main/java/com/relewise/client/model/PaginatedSearchRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PaginatedSearchRequest.java
@@ -22,7 +22,7 @@
 @JsonSubTypes({
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class PaginatedSearchRequest extends SearchRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public abstract class PaginatedSearchRequest extends SearchRequest implements IUserIdentifier
 {
     public String $type = "";
     public Integer skip;
diff --git a/src/src/main/java/com/relewise/client/model/PersonalBrandRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PersonalBrandRecommendationRequest.java
index 4a5ef1ed..cfdfc1f1 100644
--- a/src/src/main/java/com/relewise/client/model/PersonalBrandRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PersonalBrandRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PersonalBrandRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PersonalBrandRecommendationRequest extends BrandRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PersonalBrandRecommendationRequest extends BrandRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PersonalBrandRecommendationRequest, Relewise.Client";
     public Integer sinceMinutesAgo;
diff --git a/src/src/main/java/com/relewise/client/model/PersonalContentCategoryRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PersonalContentCategoryRecommendationRequest.java
index b4f0bdab..dd0eb2d1 100644
--- a/src/src/main/java/com/relewise/client/model/PersonalContentCategoryRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PersonalContentCategoryRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PersonalContentCategoryRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PersonalContentCategoryRecommendationRequest extends ContentCategoryRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PersonalContentCategoryRecommendationRequest extends ContentCategoryRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PersonalContentCategoryRecommendationRequest, Relewise.Client";
     public Integer sinceMinutesAgo;
diff --git a/src/src/main/java/com/relewise/client/model/PersonalContentRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PersonalContentRecommendationRequest.java
index 7e1500f8..3574df03 100644
--- a/src/src/main/java/com/relewise/client/model/PersonalContentRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PersonalContentRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PersonalContentRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PersonalContentRecommendationRequest extends ContentRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PersonalContentRecommendationRequest extends ContentRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PersonalContentRecommendationRequest, Relewise.Client";
     public static PersonalContentRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user)
diff --git a/src/src/main/java/com/relewise/client/model/PersonalProductCategoryRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PersonalProductCategoryRecommendationRequest.java
index 2c61a3f2..10de0f57 100644
--- a/src/src/main/java/com/relewise/client/model/PersonalProductCategoryRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PersonalProductCategoryRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PersonalProductCategoryRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PersonalProductCategoryRecommendationRequest extends ProductCategoryRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PersonalProductCategoryRecommendationRequest extends ProductCategoryRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PersonalProductCategoryRecommendationRequest, Relewise.Client";
     public Integer sinceMinutesAgo;
diff --git a/src/src/main/java/com/relewise/client/model/PersonalProductRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PersonalProductRecommendationRequest.java
index 1a4b6de6..5cca838b 100644
--- a/src/src/main/java/com/relewise/client/model/PersonalProductRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PersonalProductRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PersonalProductRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PersonalProductRecommendationRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PersonalProductRecommendationRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PersonalProductRecommendationRequest, Relewise.Client";
     public static PersonalProductRecommendationRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user)
diff --git a/src/src/main/java/com/relewise/client/model/PopularBrandsRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PopularBrandsRecommendationRequest.java
index 0dc8c9a9..0e641dc1 100644
--- a/src/src/main/java/com/relewise/client/model/PopularBrandsRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PopularBrandsRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PopularBrandsRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PopularBrandsRecommendationRequest extends BrandRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PopularBrandsRecommendationRequest extends BrandRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PopularBrandsRecommendationRequest, Relewise.Client";
     public Integer sinceMinutesAgo;
diff --git a/src/src/main/java/com/relewise/client/model/PopularContentCategoriesRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PopularContentCategoriesRecommendationRequest.java
index 43a58569..0e586661 100644
--- a/src/src/main/java/com/relewise/client/model/PopularContentCategoriesRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PopularContentCategoriesRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PopularContentCategoriesRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PopularContentCategoriesRecommendationRequest extends ContentCategoryRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PopularContentCategoriesRecommendationRequest extends ContentCategoryRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PopularContentCategoriesRecommendationRequest, Relewise.Client";
     public Integer sinceMinutesAgo;
diff --git a/src/src/main/java/com/relewise/client/model/PopularContentsRequest.java b/src/src/main/java/com/relewise/client/model/PopularContentsRequest.java
index 8fb8558a..6117f39a 100644
--- a/src/src/main/java/com/relewise/client/model/PopularContentsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PopularContentsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PopularContentsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PopularContentsRequest extends ContentRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PopularContentsRequest extends ContentRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PopularContentsRequest, Relewise.Client";
     public Integer sinceMinutesAgo;
diff --git a/src/src/main/java/com/relewise/client/model/PopularProductCategoriesRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PopularProductCategoriesRecommendationRequest.java
index 237f0668..287b0c26 100644
--- a/src/src/main/java/com/relewise/client/model/PopularProductCategoriesRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PopularProductCategoriesRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PopularProductCategoriesRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PopularProductCategoriesRecommendationRequest extends ProductCategoryRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PopularProductCategoriesRecommendationRequest extends ProductCategoryRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PopularProductCategoriesRecommendationRequest, Relewise.Client";
     public Integer sinceMinutesAgo;
diff --git a/src/src/main/java/com/relewise/client/model/PopularProductsRequest.java b/src/src/main/java/com/relewise/client/model/PopularProductsRequest.java
index 92643854..42bc3fb9 100644
--- a/src/src/main/java/com/relewise/client/model/PopularProductsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PopularProductsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PopularProductsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PopularProductsRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PopularProductsRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PopularProductsRequest, Relewise.Client";
     public PopularityTypes basedOn;
diff --git a/src/src/main/java/com/relewise/client/model/PopularSearchTermsRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/PopularSearchTermsRecommendationRequest.java
index c8fd05e8..3565f2c4 100644
--- a/src/src/main/java/com/relewise/client/model/PopularSearchTermsRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PopularSearchTermsRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PopularSearchTermsRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PopularSearchTermsRecommendationRequest extends RecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PopularSearchTermsRecommendationRequest extends RecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PopularSearchTermsRecommendationRequest, Relewise.Client";
     public @Nullable String term;
diff --git a/src/src/main/java/com/relewise/client/model/ProductAdministrativeAction.java b/src/src/main/java/com/relewise/client/model/ProductAdministrativeAction.java
index 48a23026..c51c65b8 100644
--- a/src/src/main/java/com/relewise/client/model/ProductAdministrativeAction.java
+++ b/src/src/main/java/com/relewise/client/model/ProductAdministrativeAction.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductAdministrativeAction.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductAdministrativeAction extends Trackable implements IHaveCurrencyLanguage
+public class ProductAdministrativeAction extends Trackable
 {
     public String $type = "Relewise.Client.DataTypes.ProductAdministrativeAction, Relewise.Client";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/ProductCategoryAdministrativeAction.java b/src/src/main/java/com/relewise/client/model/ProductCategoryAdministrativeAction.java
index 49b5d6d9..0e6d222f 100644
--- a/src/src/main/java/com/relewise/client/model/ProductCategoryAdministrativeAction.java
+++ b/src/src/main/java/com/relewise/client/model/ProductCategoryAdministrativeAction.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductCategoryAdministrativeAction.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductCategoryAdministrativeAction extends CategoryAdministrativeAction implements IHaveCurrencyLanguage
+public class ProductCategoryAdministrativeAction extends CategoryAdministrativeAction
 {
     public String $type = "Relewise.Client.DataTypes.ProductCategoryAdministrativeAction, Relewise.Client";
     public static ProductCategoryAdministrativeAction create(@Nullable Language language, @Nullable Currency currency, FilterCollection filters, CategoryAdministrativeActionUpdateKind kind)
diff --git a/src/src/main/java/com/relewise/client/model/ProductCategoryDataFilter.java b/src/src/main/java/com/relewise/client/model/ProductCategoryDataFilter.java
index c7701253..cdad382c 100644
--- a/src/src/main/java/com/relewise/client/model/ProductCategoryDataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/ProductCategoryDataFilter.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductCategoryDataFilter.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductCategoryDataFilter extends DataFilter implements IHaveCurrencyLanguage, IProductCategoryFilter, ICategoryFilter
+public class ProductCategoryDataFilter extends DataFilter implements IProductCategoryFilter, ICategoryFilter
 {
     public String $type = "Relewise.Client.Requests.Filters.ProductCategoryDataFilter, Relewise.Client";
     public static ProductCategoryDataFilter create(String key, String... objectPath)
diff --git a/src/src/main/java/com/relewise/client/model/ProductCategoryIdFilterCategoryQuery.java b/src/src/main/java/com/relewise/client/model/ProductCategoryIdFilterCategoryQuery.java
index 2dcb0195..2fb40909 100644
--- a/src/src/main/java/com/relewise/client/model/ProductCategoryIdFilterCategoryQuery.java
+++ b/src/src/main/java/com/relewise/client/model/ProductCategoryIdFilterCategoryQuery.java
@@ -22,7 +22,7 @@
 @JsonSubTypes({
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class ProductCategoryIdFilterCategoryQuery extends LicensedRequest implements IHaveCurrencyLanguage
+public abstract class ProductCategoryIdFilterCategoryQuery extends LicensedRequest
 {
     public String $type = "";
     public FilterCollection filters;
diff --git a/src/src/main/java/com/relewise/client/model/ProductCategoryQuery.java b/src/src/main/java/com/relewise/client/model/ProductCategoryQuery.java
index ee705442..3e2adebf 100644
--- a/src/src/main/java/com/relewise/client/model/ProductCategoryQuery.java
+++ b/src/src/main/java/com/relewise/client/model/ProductCategoryQuery.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductCategoryQuery.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductCategoryQuery extends ProductCategoryIdFilterCategoryQuery implements IHaveCurrencyLanguage
+public class ProductCategoryQuery extends ProductCategoryIdFilterCategoryQuery
 {
     public String $type = "Relewise.Client.Requests.Queries.ProductCategoryQuery, Relewise.Client";
     public static ProductCategoryQuery create()
diff --git a/src/src/main/java/com/relewise/client/model/ProductCategoryRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/ProductCategoryRecommendationRequest.java
index a47f771d..f9a39ba0 100644
--- a/src/src/main/java/com/relewise/client/model/ProductCategoryRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ProductCategoryRecommendationRequest.java
@@ -24,7 +24,7 @@
     @JsonSubTypes.Type(value = PersonalProductCategoryRecommendationRequest.class, name = "Relewise.Client.Requests.Recommendations.PersonalProductCategoryRecommendationRequest, Relewise.Client"),
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class ProductCategoryRecommendationRequest extends RecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public abstract class ProductCategoryRecommendationRequest extends RecommendationRequest implements IUserIdentifier
 {
     public String $type = "";
     public ProductCategoryRecommendationRequestSettings settings;
diff --git a/src/src/main/java/com/relewise/client/model/ProductCategorySearchRequest.java b/src/src/main/java/com/relewise/client/model/ProductCategorySearchRequest.java
index 53d5284e..d49673d0 100644
--- a/src/src/main/java/com/relewise/client/model/ProductCategorySearchRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ProductCategorySearchRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductCategorySearchRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductCategorySearchRequest extends PaginatedSearchRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ProductCategorySearchRequest extends PaginatedSearchRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Search.ProductCategorySearchRequest, Relewise.Client";
     public @Nullable String term;
diff --git a/src/src/main/java/com/relewise/client/model/ProductDataFilter.java b/src/src/main/java/com/relewise/client/model/ProductDataFilter.java
index eaa524a6..d69f90f4 100644
--- a/src/src/main/java/com/relewise/client/model/ProductDataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/ProductDataFilter.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductDataFilter.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductDataFilter extends DataFilter implements IHaveCurrencyLanguage, IProductFilter
+public class ProductDataFilter extends DataFilter implements IProductFilter
 {
     public String $type = "Relewise.Client.Requests.Filters.ProductDataFilter, Relewise.Client";
     public static ProductDataFilter create(String key, String... objectPath)
diff --git a/src/src/main/java/com/relewise/client/model/ProductPerformanceRequest.java b/src/src/main/java/com/relewise/client/model/ProductPerformanceRequest.java
index f441bd0c..a318cc9c 100644
--- a/src/src/main/java/com/relewise/client/model/ProductPerformanceRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ProductPerformanceRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductPerformanceRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductPerformanceRequest extends AnalyzerRequest implements IHaveCurrencyLanguage
+public class ProductPerformanceRequest extends AnalyzerRequest
 {
     public String $type = "Relewise.Client.Requests.Analyzers.ProductPerformanceRequest, Relewise.Client";
     public Long fromUnixTimeSeconds;
diff --git a/src/src/main/java/com/relewise/client/model/ProductRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/ProductRecommendationRequest.java
index 3d9404ac..0776a636 100644
--- a/src/src/main/java/com/relewise/client/model/ProductRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ProductRecommendationRequest.java
@@ -35,7 +35,7 @@
     @JsonSubTypes.Type(value = SearchTermBasedProductRecommendationRequest.class, name = "Relewise.Client.Requests.Recommendations.SearchTermBasedProductRecommendationRequest, Relewise.Client"),
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class ProductRecommendationRequest extends RecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public abstract class ProductRecommendationRequest extends RecommendationRequest implements IUserIdentifier
 {
     public String $type = "";
     public ProductRecommendationRequestSettings settings;
diff --git a/src/src/main/java/com/relewise/client/model/ProductSearchRequest.java b/src/src/main/java/com/relewise/client/model/ProductSearchRequest.java
index 48f4a063..f3a4fb71 100644
--- a/src/src/main/java/com/relewise/client/model/ProductSearchRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ProductSearchRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductSearchRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductSearchRequest extends PaginatedSearchRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ProductSearchRequest extends PaginatedSearchRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Search.ProductSearchRequest, Relewise.Client";
     public @Nullable String term;
diff --git a/src/src/main/java/com/relewise/client/model/ProductsViewedAfterViewingContentRequest.java b/src/src/main/java/com/relewise/client/model/ProductsViewedAfterViewingContentRequest.java
index 326e386c..9c6113eb 100644
--- a/src/src/main/java/com/relewise/client/model/ProductsViewedAfterViewingContentRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ProductsViewedAfterViewingContentRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductsViewedAfterViewingContentRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductsViewedAfterViewingContentRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ProductsViewedAfterViewingContentRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.ProductsViewedAfterViewingContentRequest, Relewise.Client";
     public String contentId;
diff --git a/src/src/main/java/com/relewise/client/model/ProductsViewedAfterViewingProductRequest.java b/src/src/main/java/com/relewise/client/model/ProductsViewedAfterViewingProductRequest.java
index 56b8716a..ccc9c1ce 100644
--- a/src/src/main/java/com/relewise/client/model/ProductsViewedAfterViewingProductRequest.java
+++ b/src/src/main/java/com/relewise/client/model/ProductsViewedAfterViewingProductRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = ProductsViewedAfterViewingProductRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ProductsViewedAfterViewingProductRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class ProductsViewedAfterViewingProductRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.ProductsViewedAfterViewingProductRequest, Relewise.Client";
     public ProductAndVariantId productAndVariantId;
diff --git a/src/src/main/java/com/relewise/client/model/PurchasedWithCurrentCartRequest.java b/src/src/main/java/com/relewise/client/model/PurchasedWithCurrentCartRequest.java
index 1d41ddcf..19d77879 100644
--- a/src/src/main/java/com/relewise/client/model/PurchasedWithCurrentCartRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PurchasedWithCurrentCartRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PurchasedWithCurrentCartRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PurchasedWithCurrentCartRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PurchasedWithCurrentCartRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PurchasedWithCurrentCartRequest, Relewise.Client";
     public static PurchasedWithCurrentCartRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user)
diff --git a/src/src/main/java/com/relewise/client/model/PurchasedWithMultipleProductsRequest.java b/src/src/main/java/com/relewise/client/model/PurchasedWithMultipleProductsRequest.java
index d16d6f60..9e390d09 100644
--- a/src/src/main/java/com/relewise/client/model/PurchasedWithMultipleProductsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PurchasedWithMultipleProductsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PurchasedWithMultipleProductsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PurchasedWithMultipleProductsRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PurchasedWithMultipleProductsRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PurchasedWithMultipleProductsRequest, Relewise.Client";
     public ProductAndVariantId[] productAndVariantIds;
diff --git a/src/src/main/java/com/relewise/client/model/PurchasedWithProductRequest.java b/src/src/main/java/com/relewise/client/model/PurchasedWithProductRequest.java
index b146891e..aa2a170e 100644
--- a/src/src/main/java/com/relewise/client/model/PurchasedWithProductRequest.java
+++ b/src/src/main/java/com/relewise/client/model/PurchasedWithProductRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = PurchasedWithProductRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class PurchasedWithProductRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class PurchasedWithProductRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.PurchasedWithProductRequest, Relewise.Client";
     public ProductAndVariantId productAndVariantId;
diff --git a/src/src/main/java/com/relewise/client/model/RecentlyViewedProductsRequest.java b/src/src/main/java/com/relewise/client/model/RecentlyViewedProductsRequest.java
index bc016671..42160a33 100644
--- a/src/src/main/java/com/relewise/client/model/RecentlyViewedProductsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/RecentlyViewedProductsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = RecentlyViewedProductsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class RecentlyViewedProductsRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class RecentlyViewedProductsRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.RecentlyViewedProductsRequest, Relewise.Client";
     public static RecentlyViewedProductsRequest create(@Nullable Language language, @Nullable Currency currency, String displayedAtLocationType, User user)
diff --git a/src/src/main/java/com/relewise/client/model/RecommendationRequest.java b/src/src/main/java/com/relewise/client/model/RecommendationRequest.java
index 680afbfa..f834bead 100644
--- a/src/src/main/java/com/relewise/client/model/RecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/RecommendationRequest.java
@@ -48,7 +48,7 @@
     @JsonSubTypes.Type(value = PersonalBrandRecommendationRequest.class, name = "Relewise.Client.Requests.Recommendations.PersonalBrandRecommendationRequest, Relewise.Client"),
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class RecommendationRequest extends LicensedRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public abstract class RecommendationRequest extends LicensedRequest implements IUserIdentifier
 {
     public String $type = "";
     public @Nullable Language language;
diff --git a/src/src/main/java/com/relewise/client/model/SearchRequest.java b/src/src/main/java/com/relewise/client/model/SearchRequest.java
index 350f88b9..d464bb48 100644
--- a/src/src/main/java/com/relewise/client/model/SearchRequest.java
+++ b/src/src/main/java/com/relewise/client/model/SearchRequest.java
@@ -29,7 +29,7 @@
     @JsonSubTypes.Type(value = SearchRequestCollection.class, name = "Relewise.Client.Requests.Search.SearchRequestCollection, Relewise.Client"),
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class SearchRequest extends LicensedRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public abstract class SearchRequest extends LicensedRequest implements IUserIdentifier
 {
     public String $type = "";
     public @Nullable Language language;
diff --git a/src/src/main/java/com/relewise/client/model/SearchRequestCollection.java b/src/src/main/java/com/relewise/client/model/SearchRequestCollection.java
index 8b7fbf54..c86968a5 100644
--- a/src/src/main/java/com/relewise/client/model/SearchRequestCollection.java
+++ b/src/src/main/java/com/relewise/client/model/SearchRequestCollection.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = SearchRequestCollection.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class SearchRequestCollection extends SearchRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class SearchRequestCollection extends SearchRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Search.SearchRequestCollection, Relewise.Client";
     public ArrayList<SearchRequest> requests;
diff --git a/src/src/main/java/com/relewise/client/model/SearchTermBasedProductRecommendationRequest.java b/src/src/main/java/com/relewise/client/model/SearchTermBasedProductRecommendationRequest.java
index 3d97677b..0273984e 100644
--- a/src/src/main/java/com/relewise/client/model/SearchTermBasedProductRecommendationRequest.java
+++ b/src/src/main/java/com/relewise/client/model/SearchTermBasedProductRecommendationRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = SearchTermBasedProductRecommendationRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class SearchTermBasedProductRecommendationRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class SearchTermBasedProductRecommendationRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.SearchTermBasedProductRecommendationRequest, Relewise.Client";
     public String term;
diff --git a/src/src/main/java/com/relewise/client/model/SearchTermPredictionRequest.java b/src/src/main/java/com/relewise/client/model/SearchTermPredictionRequest.java
index 54417943..12282422 100644
--- a/src/src/main/java/com/relewise/client/model/SearchTermPredictionRequest.java
+++ b/src/src/main/java/com/relewise/client/model/SearchTermPredictionRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = SearchTermPredictionRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class SearchTermPredictionRequest extends SearchRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class SearchTermPredictionRequest extends SearchRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Search.SearchTermPredictionRequest, Relewise.Client";
     public String term;
diff --git a/src/src/main/java/com/relewise/client/model/SimilarProductsRequest.java b/src/src/main/java/com/relewise/client/model/SimilarProductsRequest.java
index 543b724e..aaa670ed 100644
--- a/src/src/main/java/com/relewise/client/model/SimilarProductsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/SimilarProductsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = SimilarProductsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class SimilarProductsRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class SimilarProductsRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.SimilarProductsRequest, Relewise.Client";
     public @Nullable ProductAndVariantId existingProductId;
diff --git a/src/src/main/java/com/relewise/client/model/SortProductsRequest.java b/src/src/main/java/com/relewise/client/model/SortProductsRequest.java
index a3e585d8..35b80053 100644
--- a/src/src/main/java/com/relewise/client/model/SortProductsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/SortProductsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = SortProductsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class SortProductsRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class SortProductsRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.SortProductsRequest, Relewise.Client";
     public String[] productIds;
diff --git a/src/src/main/java/com/relewise/client/model/SortVariantsRequest.java b/src/src/main/java/com/relewise/client/model/SortVariantsRequest.java
index 83087eba..9d0d05a8 100644
--- a/src/src/main/java/com/relewise/client/model/SortVariantsRequest.java
+++ b/src/src/main/java/com/relewise/client/model/SortVariantsRequest.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = SortVariantsRequest.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class SortVariantsRequest extends ProductRecommendationRequest implements IUserIdentifier, IHaveCurrencyLanguage
+public class SortVariantsRequest extends ProductRecommendationRequest implements IUserIdentifier
 {
     public String $type = "Relewise.Client.Requests.Recommendations.SortVariantsRequest, Relewise.Client";
     public String productId;
diff --git a/src/src/main/java/com/relewise/client/model/UserQuery.java b/src/src/main/java/com/relewise/client/model/UserQuery.java
index 587cced3..ed701143 100644
--- a/src/src/main/java/com/relewise/client/model/UserQuery.java
+++ b/src/src/main/java/com/relewise/client/model/UserQuery.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = UserQuery.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class UserQuery extends LicensedRequest implements IHaveCurrencyLanguage
+public class UserQuery extends LicensedRequest
 {
     public String $type = "Relewise.Client.Requests.Queries.UserQuery, Relewise.Client";
     public UserQueryCriteria[] criteria;
diff --git a/src/src/main/java/com/relewise/client/model/UserQueryCriteria.java b/src/src/main/java/com/relewise/client/model/UserQueryCriteria.java
index d1b4d692..2964561e 100644
--- a/src/src/main/java/com/relewise/client/model/UserQueryCriteria.java
+++ b/src/src/main/java/com/relewise/client/model/UserQueryCriteria.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = UserQueryCriteria.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class UserQueryCriteria implements IHaveCurrencyLanguage
+public class UserQueryCriteria
 {
     public String $type = "Relewise.Client.DataTypes.UserQueryCriteria, Relewise.Client";
     public @Nullable String authenticatedId;
diff --git a/src/src/main/java/com/relewise/client/model/VariantDataFilter.java b/src/src/main/java/com/relewise/client/model/VariantDataFilter.java
index 13b362f7..6542a876 100644
--- a/src/src/main/java/com/relewise/client/model/VariantDataFilter.java
+++ b/src/src/main/java/com/relewise/client/model/VariantDataFilter.java
@@ -21,7 +21,7 @@
     property = "$type",
     defaultImpl = VariantDataFilter.class)
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class VariantDataFilter extends DataFilter implements IHaveCurrencyLanguage, IVariantFilter
+public class VariantDataFilter extends DataFilter implements IVariantFilter
 {
     public String $type = "Relewise.Client.Requests.Filters.VariantDataFilter, Relewise.Client";
     public static VariantDataFilter create(String key, String... objectPath)