diff --git a/changes.md b/changes.md
index d0f19d54857..1afec7df218 100644
--- a/changes.md
+++ b/changes.md
@@ -1,5 +1,14 @@
 **Api changes**
 
+<details>
+<summary>Changed Property(s)</summary>
+
+- :warning: changed property `custom` of type `MyBusinessUnitDraft` from type `CustomFields` to `CustomFieldsDraft`
+- :warning: changed property `custom` of type `MyCompanyDraft` from type `CustomFields` to `CustomFieldsDraft`
+- :warning: changed property `custom` of type `MyDivisionDraft` from type `CustomFields` to `CustomFieldsDraft`
+</details>
+
+
 <details>
 <summary>Added Property(s)</summary>
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyBusinessUnitDraft.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyBusinessUnitDraft.java
index 4cf22e6ceda..5d826951ad8 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyBusinessUnitDraft.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyBusinessUnitDraft.java
@@ -12,7 +12,7 @@
 
 import com.commercetools.api.models.business_unit.BusinessUnitType;
 import com.commercetools.api.models.common.BaseAddress;
-import com.commercetools.api.models.type.CustomFields;
+import com.commercetools.api.models.type.CustomFieldsDraft;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -38,8 +38,8 @@
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "unitType", defaultImpl = MyBusinessUnitDraftImpl.class, visible = true)
 @JsonDeserialize(as = MyBusinessUnitDraftImpl.class)
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-public interface MyBusinessUnitDraft
-        extends com.commercetools.api.models.Customizable<MyBusinessUnitDraft>, com.commercetools.api.models.WithKey {
+public interface MyBusinessUnitDraft extends com.commercetools.api.models.CustomizableDraft<MyBusinessUnitDraft>,
+        com.commercetools.api.models.WithKey {
 
     /**
      *  <p>User-defined unique identifier for the BusinessUnit.</p>
@@ -79,7 +79,7 @@ public interface MyBusinessUnitDraft
      */
     @Valid
     @JsonProperty("custom")
-    public CustomFields getCustom();
+    public CustomFieldsDraft getCustom();
 
     /**
      *  <p>Addresses used by the Business Unit.</p>
@@ -147,7 +147,7 @@ public interface MyBusinessUnitDraft
      * @param custom value to be set
      */
 
-    public void setCustom(final CustomFields custom);
+    public void setCustom(final CustomFieldsDraft custom);
 
     /**
      *  <p>Addresses used by the Business Unit.</p>
@@ -230,7 +230,7 @@ public static MyBusinessUnitDraft deepCopy(@Nullable final MyBusinessUnitDraft t
         instance.setKey(template.getKey());
         instance.setName(template.getName());
         instance.setContactEmail(template.getContactEmail());
-        instance.setCustom(com.commercetools.api.models.type.CustomFields.deepCopy(template.getCustom()));
+        instance.setCustom(com.commercetools.api.models.type.CustomFieldsDraft.deepCopy(template.getCustom()));
         instance.setAddresses(Optional.ofNullable(template.getAddresses())
                 .map(t -> t.stream()
                         .map(com.commercetools.api.models.common.BaseAddress::deepCopy)
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyBusinessUnitDraftImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyBusinessUnitDraftImpl.java
index ccd0e755b32..d3f80dc36e2 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyBusinessUnitDraftImpl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyBusinessUnitDraftImpl.java
@@ -30,7 +30,7 @@ public class MyBusinessUnitDraftImpl implements MyBusinessUnitDraft, ModelBase {
 
     private String contactEmail;
 
-    private com.commercetools.api.models.type.CustomFields custom;
+    private com.commercetools.api.models.type.CustomFieldsDraft custom;
 
     private java.util.List<com.commercetools.api.models.common.BaseAddress> addresses;
 
@@ -49,7 +49,7 @@ public class MyBusinessUnitDraftImpl implements MyBusinessUnitDraft, ModelBase {
     MyBusinessUnitDraftImpl(@JsonProperty("key") final String key,
             @JsonProperty("unitType") final com.commercetools.api.models.business_unit.BusinessUnitType unitType,
             @JsonProperty("name") final String name, @JsonProperty("contactEmail") final String contactEmail,
-            @JsonProperty("custom") final com.commercetools.api.models.type.CustomFields custom,
+            @JsonProperty("custom") final com.commercetools.api.models.type.CustomFieldsDraft custom,
             @JsonProperty("addresses") final java.util.List<com.commercetools.api.models.common.BaseAddress> addresses,
             @JsonProperty("shippingAddresses") final java.util.List<Integer> shippingAddresses,
             @JsonProperty("defaultShippingAddress") final Integer defaultShippingAddress,
@@ -109,7 +109,7 @@ public String getContactEmail() {
      *  <p>Custom Fields for the Business Unit.</p>
      */
 
-    public com.commercetools.api.models.type.CustomFields getCustom() {
+    public com.commercetools.api.models.type.CustomFieldsDraft getCustom() {
         return this.custom;
     }
 
@@ -165,7 +165,7 @@ public void setContactEmail(final String contactEmail) {
         this.contactEmail = contactEmail;
     }
 
-    public void setCustom(final com.commercetools.api.models.type.CustomFields custom) {
+    public void setCustom(final com.commercetools.api.models.type.CustomFieldsDraft custom) {
         this.custom = custom;
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraft.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraft.java
index ad0f347c29d..a960be0debf 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraft.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraft.java
@@ -77,7 +77,7 @@ public static MyCompanyDraft deepCopy(@Nullable final MyCompanyDraft template) {
         instance.setKey(template.getKey());
         instance.setName(template.getName());
         instance.setContactEmail(template.getContactEmail());
-        instance.setCustom(com.commercetools.api.models.type.CustomFields.deepCopy(template.getCustom()));
+        instance.setCustom(com.commercetools.api.models.type.CustomFieldsDraft.deepCopy(template.getCustom()));
         instance.setAddresses(Optional.ofNullable(template.getAddresses())
                 .map(t -> t.stream()
                         .map(com.commercetools.api.models.common.BaseAddress::deepCopy)
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraftBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraftBuilder.java
index 8e63aa9c19d..faf91a01115 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraftBuilder.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraftBuilder.java
@@ -33,7 +33,7 @@ public class MyCompanyDraftBuilder implements Builder<MyCompanyDraft> {
     private String contactEmail;
 
     @Nullable
-    private com.commercetools.api.models.type.CustomFields custom;
+    private com.commercetools.api.models.type.CustomFieldsDraft custom;
 
     @Nullable
     private java.util.List<com.commercetools.api.models.common.BaseAddress> addresses;
@@ -90,8 +90,8 @@ public MyCompanyDraftBuilder contactEmail(@Nullable final String contactEmail) {
      */
 
     public MyCompanyDraftBuilder custom(
-            Function<com.commercetools.api.models.type.CustomFieldsBuilder, com.commercetools.api.models.type.CustomFieldsBuilder> builder) {
-        this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsBuilder.of()).build();
+            Function<com.commercetools.api.models.type.CustomFieldsDraftBuilder, com.commercetools.api.models.type.CustomFieldsDraftBuilder> builder) {
+        this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of()).build();
         return this;
     }
 
@@ -102,8 +102,8 @@ public MyCompanyDraftBuilder custom(
      */
 
     public MyCompanyDraftBuilder withCustom(
-            Function<com.commercetools.api.models.type.CustomFieldsBuilder, com.commercetools.api.models.type.CustomFields> builder) {
-        this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsBuilder.of());
+            Function<com.commercetools.api.models.type.CustomFieldsDraftBuilder, com.commercetools.api.models.type.CustomFieldsDraft> builder) {
+        this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of());
         return this;
     }
 
@@ -113,7 +113,7 @@ public MyCompanyDraftBuilder withCustom(
      * @return Builder
      */
 
-    public MyCompanyDraftBuilder custom(@Nullable final com.commercetools.api.models.type.CustomFields custom) {
+    public MyCompanyDraftBuilder custom(@Nullable final com.commercetools.api.models.type.CustomFieldsDraft custom) {
         this.custom = custom;
         return this;
     }
@@ -335,7 +335,7 @@ public String getContactEmail() {
      */
 
     @Nullable
-    public com.commercetools.api.models.type.CustomFields getCustom() {
+    public com.commercetools.api.models.type.CustomFieldsDraft getCustom() {
         return this.custom;
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraftImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraftImpl.java
index d64d8e65d71..00b3bcce50b 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraftImpl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyCompanyDraftImpl.java
@@ -31,7 +31,7 @@ public class MyCompanyDraftImpl implements MyCompanyDraft, ModelBase {
 
     private String contactEmail;
 
-    private com.commercetools.api.models.type.CustomFields custom;
+    private com.commercetools.api.models.type.CustomFieldsDraft custom;
 
     private java.util.List<com.commercetools.api.models.common.BaseAddress> addresses;
 
@@ -49,7 +49,7 @@ public class MyCompanyDraftImpl implements MyCompanyDraft, ModelBase {
     @JsonCreator
     MyCompanyDraftImpl(@JsonProperty("key") final String key, @JsonProperty("name") final String name,
             @JsonProperty("contactEmail") final String contactEmail,
-            @JsonProperty("custom") final com.commercetools.api.models.type.CustomFields custom,
+            @JsonProperty("custom") final com.commercetools.api.models.type.CustomFieldsDraft custom,
             @JsonProperty("addresses") final java.util.List<com.commercetools.api.models.common.BaseAddress> addresses,
             @JsonProperty("shippingAddresses") final java.util.List<Integer> shippingAddresses,
             @JsonProperty("defaultShippingAddress") final Integer defaultShippingAddress,
@@ -110,7 +110,7 @@ public String getContactEmail() {
      *  <p>Custom Fields for the Business Unit.</p>
      */
 
-    public com.commercetools.api.models.type.CustomFields getCustom() {
+    public com.commercetools.api.models.type.CustomFieldsDraft getCustom() {
         return this.custom;
     }
 
@@ -166,7 +166,7 @@ public void setContactEmail(final String contactEmail) {
         this.contactEmail = contactEmail;
     }
 
-    public void setCustom(final com.commercetools.api.models.type.CustomFields custom) {
+    public void setCustom(final com.commercetools.api.models.type.CustomFieldsDraft custom) {
         this.custom = custom;
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraft.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraft.java
index a6f61466ecc..f0dcf1f439a 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraft.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraft.java
@@ -98,7 +98,7 @@ public static MyDivisionDraft deepCopy(@Nullable final MyDivisionDraft template)
         instance.setKey(template.getKey());
         instance.setName(template.getName());
         instance.setContactEmail(template.getContactEmail());
-        instance.setCustom(com.commercetools.api.models.type.CustomFields.deepCopy(template.getCustom()));
+        instance.setCustom(com.commercetools.api.models.type.CustomFieldsDraft.deepCopy(template.getCustom()));
         instance.setAddresses(Optional.ofNullable(template.getAddresses())
                 .map(t -> t.stream()
                         .map(com.commercetools.api.models.common.BaseAddress::deepCopy)
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraftBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraftBuilder.java
index 0d6f383970c..5334d16b64f 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraftBuilder.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraftBuilder.java
@@ -34,7 +34,7 @@ public class MyDivisionDraftBuilder implements Builder<MyDivisionDraft> {
     private String contactEmail;
 
     @Nullable
-    private com.commercetools.api.models.type.CustomFields custom;
+    private com.commercetools.api.models.type.CustomFieldsDraft custom;
 
     @Nullable
     private java.util.List<com.commercetools.api.models.common.BaseAddress> addresses;
@@ -93,8 +93,8 @@ public MyDivisionDraftBuilder contactEmail(@Nullable final String contactEmail)
      */
 
     public MyDivisionDraftBuilder custom(
-            Function<com.commercetools.api.models.type.CustomFieldsBuilder, com.commercetools.api.models.type.CustomFieldsBuilder> builder) {
-        this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsBuilder.of()).build();
+            Function<com.commercetools.api.models.type.CustomFieldsDraftBuilder, com.commercetools.api.models.type.CustomFieldsDraftBuilder> builder) {
+        this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of()).build();
         return this;
     }
 
@@ -105,8 +105,8 @@ public MyDivisionDraftBuilder custom(
      */
 
     public MyDivisionDraftBuilder withCustom(
-            Function<com.commercetools.api.models.type.CustomFieldsBuilder, com.commercetools.api.models.type.CustomFields> builder) {
-        this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsBuilder.of());
+            Function<com.commercetools.api.models.type.CustomFieldsDraftBuilder, com.commercetools.api.models.type.CustomFieldsDraft> builder) {
+        this.custom = builder.apply(com.commercetools.api.models.type.CustomFieldsDraftBuilder.of());
         return this;
     }
 
@@ -116,7 +116,7 @@ public MyDivisionDraftBuilder withCustom(
      * @return Builder
      */
 
-    public MyDivisionDraftBuilder custom(@Nullable final com.commercetools.api.models.type.CustomFields custom) {
+    public MyDivisionDraftBuilder custom(@Nullable final com.commercetools.api.models.type.CustomFieldsDraft custom) {
         this.custom = custom;
         return this;
     }
@@ -377,7 +377,7 @@ public String getContactEmail() {
      */
 
     @Nullable
-    public com.commercetools.api.models.type.CustomFields getCustom() {
+    public com.commercetools.api.models.type.CustomFieldsDraft getCustom() {
         return this.custom;
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraftImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraftImpl.java
index 5efe5943b70..33760618014 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraftImpl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyDivisionDraftImpl.java
@@ -31,7 +31,7 @@ public class MyDivisionDraftImpl implements MyDivisionDraft, ModelBase {
 
     private String contactEmail;
 
-    private com.commercetools.api.models.type.CustomFields custom;
+    private com.commercetools.api.models.type.CustomFieldsDraft custom;
 
     private java.util.List<com.commercetools.api.models.common.BaseAddress> addresses;
 
@@ -51,7 +51,7 @@ public class MyDivisionDraftImpl implements MyDivisionDraft, ModelBase {
     @JsonCreator
     MyDivisionDraftImpl(@JsonProperty("key") final String key, @JsonProperty("name") final String name,
             @JsonProperty("contactEmail") final String contactEmail,
-            @JsonProperty("custom") final com.commercetools.api.models.type.CustomFields custom,
+            @JsonProperty("custom") final com.commercetools.api.models.type.CustomFieldsDraft custom,
             @JsonProperty("addresses") final java.util.List<com.commercetools.api.models.common.BaseAddress> addresses,
             @JsonProperty("shippingAddresses") final java.util.List<Integer> shippingAddresses,
             @JsonProperty("defaultShippingAddress") final Integer defaultShippingAddress,
@@ -114,7 +114,7 @@ public String getContactEmail() {
      *  <p>Custom Fields for the Business Unit.</p>
      */
 
-    public com.commercetools.api.models.type.CustomFields getCustom() {
+    public com.commercetools.api.models.type.CustomFieldsDraft getCustom() {
         return this.custom;
     }
 
@@ -178,7 +178,7 @@ public void setContactEmail(final String contactEmail) {
         this.contactEmail = contactEmail;
     }
 
-    public void setCustom(final com.commercetools.api.models.type.CustomFields custom) {
+    public void setCustom(final com.commercetools.api.models.type.CustomFieldsDraft custom) {
         this.custom = custom;
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyBusinessUnitDraftQueryBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyBusinessUnitDraftQueryBuilderDsl.java
index 6ca5fb19c6a..fdf883fb1e4 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyBusinessUnitDraftQueryBuilderDsl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyBusinessUnitDraftQueryBuilderDsl.java
@@ -37,11 +37,11 @@ public StringComparisonPredicateBuilder<MyBusinessUnitDraftQueryBuilderDsl> cont
     }
 
     public CombinationQueryPredicate<MyBusinessUnitDraftQueryBuilderDsl> custom(
-            Function<com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl>> fn) {
+            Function<com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl>> fn) {
         return new CombinationQueryPredicate<>(
             ContainerQueryPredicate.of()
                     .parent(ConstantQueryPredicate.of().constant("custom"))
-                    .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl.of())),
+                    .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl.of())),
             MyBusinessUnitDraftQueryBuilderDsl::of);
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyCompanyDraftQueryBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyCompanyDraftQueryBuilderDsl.java
index f6456e2369e..0f3ce101c5f 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyCompanyDraftQueryBuilderDsl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyCompanyDraftQueryBuilderDsl.java
@@ -37,11 +37,11 @@ public StringComparisonPredicateBuilder<MyCompanyDraftQueryBuilderDsl> contactEm
     }
 
     public CombinationQueryPredicate<MyCompanyDraftQueryBuilderDsl> custom(
-            Function<com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl>> fn) {
+            Function<com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl>> fn) {
         return new CombinationQueryPredicate<>(
             ContainerQueryPredicate.of()
                     .parent(ConstantQueryPredicate.of().constant("custom"))
-                    .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl.of())),
+                    .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl.of())),
             MyCompanyDraftQueryBuilderDsl::of);
     }
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyDivisionDraftQueryBuilderDsl.java b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyDivisionDraftQueryBuilderDsl.java
index d3cc01ff514..1ae99cb295d 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyDivisionDraftQueryBuilderDsl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-predicates-generated/com/commercetools/api/predicates/query/me/MyDivisionDraftQueryBuilderDsl.java
@@ -37,11 +37,11 @@ public StringComparisonPredicateBuilder<MyDivisionDraftQueryBuilderDsl> contactE
     }
 
     public CombinationQueryPredicate<MyDivisionDraftQueryBuilderDsl> custom(
-            Function<com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl>> fn) {
+            Function<com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl, CombinationQueryPredicate<com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl>> fn) {
         return new CombinationQueryPredicate<>(
             ContainerQueryPredicate.of()
                     .parent(ConstantQueryPredicate.of().constant("custom"))
-                    .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsQueryBuilderDsl.of())),
+                    .inner(fn.apply(com.commercetools.api.predicates.query.type.CustomFieldsDraftQueryBuilderDsl.of())),
             MyDivisionDraftQueryBuilderDsl::of);
     }
 
diff --git a/references.txt b/references.txt
index 2a3be112074..ac3e4140584 100644
--- a/references.txt
+++ b/references.txt
@@ -223,3 +223,4 @@ a9d748dbcbfc8d2a1cd8d0f8c4e48807e502e79e
 90f86a472abcdf9adc0c3f0147e3094ec0a7c8ba
 c8a374e9c967c7b8c5080c9a6ed2cd92261680ef
 cbdd859f3702f084fa22a22d7e4459f7e4b43316
+32b48b6b1b219f185cf066f9f4b53cd782f98435