diff --git a/changes.md b/changes.md
index 1079f96abd0..a6af6db8a93 100644
--- a/changes.md
+++ b/changes.md
@@ -1,213 +1,63 @@
 **Api changes**
 
 <details>
-<summary>Added QueryParameter(s)</summary>
+<summary>Added Enum(s)</summary>
 
-- added query parameter `expand` to method `get /{projectKey}/in-store/key={storeKey}/cart-discounts`
-- added query parameter `sort` to method `get /{projectKey}/in-store/key={storeKey}/cart-discounts`
-- added query parameter `limit` to method `get /{projectKey}/in-store/key={storeKey}/cart-discounts`
-- added query parameter `offset` to method `get /{projectKey}/in-store/key={storeKey}/cart-discounts`
-- added query parameter `withTotal` to method `get /{projectKey}/in-store/key={storeKey}/cart-discounts`
-- added query parameter `where` to method `get /{projectKey}/in-store/key={storeKey}/cart-discounts`
-- added query parameter `/^var[.][a-zA-Z0-9]+$/` to method `get /{projectKey}/in-store/key={storeKey}/cart-discounts`
-- added query parameter `expand` to method `post /{projectKey}/in-store/key={storeKey}/cart-discounts`
+- added enum `associate-role` to type `AttributeReferenceTypeId`
+- added enum `business-unit` to type `AttributeReferenceTypeId`
+- added enum `cart-discount` to type `AttributeReferenceTypeId`
 </details>
 
+**History changes**
 
 <details>
-<summary>Added Enum(s)</summary>
+<summary>Added Type(s)</summary>
 
-- added enum `approval-flow` to type `ReferenceTypeId`
-- added enum `approval-rule` to type `ReferenceTypeId`
-- added enum `approval-flow` to type `ChangeSubscriptionResourceTypeId`
-- added enum `approval-rule` to type `ChangeSubscriptionResourceTypeId`
-- added enum `approval-flow` to type `MessageSubscriptionResourceTypeId`
-- added enum `approval-rule` to type `MessageSubscriptionResourceTypeId`
+- added type `AttributeLocalizedEnumValue`
+- added type `AttributePlainEnumValue`
+- added type `ChannelRoleEnum`
+- added type `StateRoleEnum`
+- added type `StateTypeEnum`
 </details>
 
 
 <details>
-<summary>Changed MethodResponseBody(s)</summary>
+<summary>Removed Type(s)</summary>
 
-- :warning: changed response body for `200: application/json` of method `get /{projectKey}/in-store/key={storeKey}/cart-discounts` from type `CartDiscount` to `CartDiscountPagedQueryResponse`
+- :warning: removed type `ChannelRole`
+- :warning: removed type `StateRole`
+- :warning: removed type `StateType`
 </details>
 
 
 <details>
-<summary>Added Method(s)</summary>
+<summary>Removed Property(s)</summary>
 
-- added method `apiRoot.withProjectKey().head()`
-- added method `apiRoot.withProjectKey().associateRoles().head()`
-- added method `apiRoot.withProjectKey().businessUnits().head()`
-- added method `apiRoot.withProjectKey().categories().head()`
-- added method `apiRoot.withProjectKey().carts().head()`
-- added method `apiRoot.withProjectKey().cartDiscounts().head()`
-- added method `apiRoot.withProjectKey().channels().head()`
-- added method `apiRoot.withProjectKey().customers().head()`
-- added method `apiRoot.withProjectKey().customerGroups().head()`
-- added method `apiRoot.withProjectKey().customObjects().head()`
-- added method `apiRoot.withProjectKey().discountCodes().head()`
-- added method `apiRoot.withProjectKey().inventory().head()`
-- added method `apiRoot.withProjectKey().messages().head()`
-- added method `apiRoot.withProjectKey().orders().head()`
-- added method `apiRoot.withProjectKey().payments().head()`
-- added method `apiRoot.withProjectKey().productDiscounts().head()`
-- added method `apiRoot.withProjectKey().productProjections().head()`
-- added method `apiRoot.withProjectKey().productSelections().head()`
-- added method `apiRoot.withProjectKey().quotes().head()`
-- added method `apiRoot.withProjectKey().quoteRequests().head()`
-- added method `apiRoot.withProjectKey().stagedQuotes().head()`
-- added method `apiRoot.withProjectKey().reviews().head()`
-- added method `apiRoot.withProjectKey().shippingMethods().head()`
-- added method `apiRoot.withProjectKey().shoppingLists().head()`
-- added method `apiRoot.withProjectKey().states().head()`
-- added method `apiRoot.withProjectKey().subscriptions().head()`
-- added method `apiRoot.withProjectKey().taxCategories().head()`
-- added method `apiRoot.withProjectKey().types().head()`
-- added method `apiRoot.withProjectKey().zones().head()`
-- added method `apiRoot.withProjectKey().extensions().head()`
-- added method `apiRoot.withProjectKey().apiClients().head()`
-- added method `apiRoot.withProjectKey().stores().head()`
-- added method `apiRoot.withProjectKey().standalonePrices().head()`
-- added method `apiRoot.withProjectKey().attributeGroups().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().businessUnits().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().businessUnits().withKey().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().businessUnits().withId().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().carts().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().orders().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().quotes().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().quoteRequests().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().carts().withKey().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().carts().withId().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().orders().withOrderNumber().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().orders().withId().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().quotes().withKey().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().quotes().withId().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().quoteRequests().withKey().head()`
-- added method `apiRoot.withProjectKey().asAssociate().withAssociateIdValue().inBusinessUnitKeyWithBusinessUnitKeyValue().quoteRequests().withId().head()`
-- added method `apiRoot.withProjectKey().associateRoles().withKey().head()`
-- added method `apiRoot.withProjectKey().associateRoles().withId().head()`
-- added method `apiRoot.withProjectKey().businessUnits().withKey().head()`
-- added method `apiRoot.withProjectKey().businessUnits().withId().head()`
-- added method `apiRoot.withProjectKey().categories().withKey().head()`
-- added method `apiRoot.withProjectKey().categories().withId().head()`
-- added method `apiRoot.withProjectKey().carts().withCustomerId().head()`
-- added method `apiRoot.withProjectKey().carts().withKey().head()`
-- added method `apiRoot.withProjectKey().carts().withId().head()`
-- added method `apiRoot.withProjectKey().cartDiscounts().withKey().head()`
-- added method `apiRoot.withProjectKey().cartDiscounts().withId().head()`
-- added method `apiRoot.withProjectKey().channels().withId().head()`
-- added method `apiRoot.withProjectKey().customers().withKey().head()`
-- added method `apiRoot.withProjectKey().customers().withId().head()`
-- added method `apiRoot.withProjectKey().customerGroups().withKey().head()`
-- added method `apiRoot.withProjectKey().customerGroups().withId().head()`
-- added method `apiRoot.withProjectKey().discountCodes().withId().head()`
-- added method `apiRoot.withProjectKey().inventory().withId().head()`
-- added method `apiRoot.withProjectKey().inventory().withKey().head()`
-- added method `apiRoot.withProjectKey().messages().withId().head()`
-- added method `apiRoot.withProjectKey().orders().withOrderNumber().head()`
-- added method `apiRoot.withProjectKey().orders().edits().head()`
-- added method `apiRoot.withProjectKey().orders().withId().head()`
-- added method `apiRoot.withProjectKey().orders().edits().withKey().head()`
-- added method `apiRoot.withProjectKey().orders().edits().withId().head()`
-- added method `apiRoot.withProjectKey().payments().withKey().head()`
-- added method `apiRoot.withProjectKey().payments().withId().head()`
-- added method `apiRoot.withProjectKey().productDiscounts().withKey().head()`
-- added method `apiRoot.withProjectKey().productDiscounts().withId().head()`
-- added method `apiRoot.withProjectKey().productProjections().withKey().head()`
-- added method `apiRoot.withProjectKey().productProjections().withId().head()`
-- added method `apiRoot.withProjectKey().productSelections().withKey().head()`
-- added method `apiRoot.withProjectKey().productSelections().withId().head()`
-- added method `apiRoot.withProjectKey().quotes().withKey().head()`
-- added method `apiRoot.withProjectKey().quotes().withId().head()`
-- added method `apiRoot.withProjectKey().quoteRequests().withKey().head()`
-- added method `apiRoot.withProjectKey().quoteRequests().withId().head()`
-- added method `apiRoot.withProjectKey().stagedQuotes().withKey().head()`
-- added method `apiRoot.withProjectKey().stagedQuotes().withId().head()`
-- added method `apiRoot.withProjectKey().reviews().withKey().head()`
-- added method `apiRoot.withProjectKey().reviews().withId().head()`
-- added method `apiRoot.withProjectKey().shippingMethods().withKey().head()`
-- added method `apiRoot.withProjectKey().shippingMethods().matchingCart().head()`
-- added method `apiRoot.withProjectKey().shippingMethods().matchingCartLocation().head()`
-- added method `apiRoot.withProjectKey().shippingMethods().matchingOrderedit().head()`
-- added method `apiRoot.withProjectKey().shippingMethods().matchingLocation().head()`
-- added method `apiRoot.withProjectKey().shippingMethods().withId().head()`
-- added method `apiRoot.withProjectKey().shoppingLists().withKey().head()`
-- added method `apiRoot.withProjectKey().shoppingLists().withId().head()`
-- added method `apiRoot.withProjectKey().states().withKey().head()`
-- added method `apiRoot.withProjectKey().states().withId().head()`
-- added method `apiRoot.withProjectKey().subscriptions().withKey().head()`
-- added method `apiRoot.withProjectKey().subscriptions().withId().head()`
-- added method `apiRoot.withProjectKey().taxCategories().withKey().head()`
-- added method `apiRoot.withProjectKey().taxCategories().withId().head()`
-- added method `apiRoot.withProjectKey().types().withKey().head()`
-- added method `apiRoot.withProjectKey().types().withId().head()`
-- added method `apiRoot.withProjectKey().zones().withKey().head()`
-- added method `apiRoot.withProjectKey().zones().withId().head()`
-- added method `apiRoot.withProjectKey().me().activeCart().head()`
-- added method `apiRoot.withProjectKey().me().businessUnits().head()`
-- added method `apiRoot.withProjectKey().me().carts().head()`
-- added method `apiRoot.withProjectKey().me().orders().head()`
-- added method `apiRoot.withProjectKey().me().payments().head()`
-- added method `apiRoot.withProjectKey().me().quoteRequests().head()`
-- added method `apiRoot.withProjectKey().me().quotes().head()`
-- added method `apiRoot.withProjectKey().me().shoppingLists().head()`
-- added method `apiRoot.withProjectKey().me().businessUnits().withId().head()`
-- added method `apiRoot.withProjectKey().me().businessUnits().withKey().head()`
-- added method `apiRoot.withProjectKey().me().carts().withKey().head()`
-- added method `apiRoot.withProjectKey().me().carts().withId().head()`
-- added method `apiRoot.withProjectKey().me().orders().withId().head()`
-- added method `apiRoot.withProjectKey().me().payments().withId().head()`
-- added method `apiRoot.withProjectKey().me().quoteRequests().withId().head()`
-- added method `apiRoot.withProjectKey().me().quoteRequests().withKey().head()`
-- added method `apiRoot.withProjectKey().me().quotes().withId().head()`
-- added method `apiRoot.withProjectKey().me().quotes().withKey().head()`
-- added method `apiRoot.withProjectKey().me().shoppingLists().withId().head()`
-- added method `apiRoot.withProjectKey().me().shoppingLists().withKey().head()`
-- added method `apiRoot.withProjectKey().extensions().withKey().head()`
-- added method `apiRoot.withProjectKey().extensions().withId().head()`
-- added method `apiRoot.withProjectKey().apiClients().withId().head()`
-- added method `apiRoot.withProjectKey().stores().withKey().head()`
-- added method `apiRoot.withProjectKey().stores().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().carts().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().orders().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().customers().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().shoppingLists().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().cartDiscounts().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().carts().withCustomerId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().carts().withKey().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().carts().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().orders().withOrderNumber().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().orders().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().me().carts().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().me().orders().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().me().activeCart().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().me().shoppingLists().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().me().carts().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().me().orders().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().me().shoppingLists().withKey().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().me().shoppingLists().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().customers().withKey().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().customers().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().shippingMethods().matchingCart().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().shoppingLists().withKey().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().shoppingLists().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().productProjections().withKey().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().productProjections().withId().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().cartDiscounts().withKey().head()`
-- added method `apiRoot.withProjectKey().inStoreKeyWithStoreKeyValue().cartDiscounts().withId().head()`
-- added method `apiRoot.withProjectKey().standalonePrices().withKey().head()`
-- added method `apiRoot.withProjectKey().standalonePrices().withId().head()`
-- added method `apiRoot.withProjectKey().attributeGroups().withKey().head()`
-- added method `apiRoot.withProjectKey().attributeGroups().withId().head()`
+- :warning: removed property `previousValue` from type `AddAddressChange`
+- :warning: removed property `previousValue` from type `AddLocationChange`
+- :warning: removed property `nextValue` from type `RemoveLocationChange`
+- :warning: removed property `nextValue` from type `RemoveTaxRateChange`
 </details>
 
-**History changes**
 
 <details>
 <summary>Changed Property(s)</summary>
 
-- :warning: changed property `previousValue` of type `SetNameChange` from type `LocalizedString` to `string`
-- :warning: changed property `nextValue` of type `SetNameChange` from type `LocalizedString` to `string`
+- :warning: changed property `previousValue` of type `AddChannelRolesChange` from type `ChannelRole[]` to `ChannelRoleEnum[]`
+- :warning: changed property `nextValue` of type `AddChannelRolesChange` from type `ChannelRole[]` to `ChannelRoleEnum[]`
+- :warning: changed property `nextValue` of type `AddLocalizedEnumValueChange` from type `LocalizedEnumValue` to `AttributeLocalizedEnumValue`
+- :warning: changed property `nextValue` of type `AddPlainEnumValueChange` from type `EnumValue` to `AttributePlainEnumValue`
+- :warning: changed property `previousValue` of type `AddStateRolesChange` from type `StateRole[]` to `StateRoleEnum[]`
+- :warning: changed property `nextValue` of type `AddStateRolesChange` from type `StateRole[]` to `StateRoleEnum[]`
+- :warning: changed property `previousValue` of type `ChangeStateTypeChange` from type `StateType` to `StateTypeEnum`
+- :warning: changed property `nextValue` of type `ChangeStateTypeChange` from type `StateType` to `StateTypeEnum`
+- :warning: changed property `previousValue` of type `RemoveChannelRolesChange` from type `ChannelRole[]` to `ChannelRoleEnum[]`
+- :warning: changed property `nextValue` of type `RemoveChannelRolesChange` from type `ChannelRole[]` to `ChannelRoleEnum[]`
+- :warning: changed property `previousValue` of type `RemoveStateRolesChange` from type `StateRole[]` to `StateRoleEnum[]`
+- :warning: changed property `nextValue` of type `RemoveStateRolesChange` from type `StateRole[]` to `StateRoleEnum[]`
+- :warning: changed property `previousValue` of type `SetChannelRolesChange` from type `ChannelRole[]` to `ChannelRoleEnum[]`
+- :warning: changed property `nextValue` of type `SetChannelRolesChange` from type `ChannelRole[]` to `ChannelRoleEnum[]`
+- :warning: changed property `previousValue` of type `SetStateRolesChange` from type `StateRole[]` to `StateRoleEnum[]`
+- :warning: changed property `nextValue` of type `SetStateRolesChange` from type `StateRole[]` to `StateRoleEnum[]`
 </details>
 
diff --git a/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls b/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls
index af055beca45..17332dc2eda 100644
--- a/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls
+++ b/commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls
@@ -125,7 +125,6 @@ input AddCartDiscountCode {
   validateDuplicates: Boolean = false
 }
 
-"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
 input AddCartDiscountStore {
   store: ResourceIdentifierInput!
 }
@@ -1699,7 +1698,6 @@ type Cart implements Versioned & ReferenceExpandable {
   customLineItems: [CustomLineItem!]!
   totalPrice: Money!
   taxedPrice: TaxedPrice
-  "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
   discountOnTotalPrice: DiscountOnTotalPrice
   shippingAddress: Address
   billingAddress: Address
@@ -1784,11 +1782,7 @@ type CartDiscount implements Versioned & ReferenceExpandable {
   descriptionAllLocales: [LocalizedString!]
   referenceRefs: [Reference!]!
   custom: CustomFieldsType
-
-  "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
   storesRef: [KeyReference!]!
-
-  "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
   stores: [Store!]!
   value: CartDiscountValue!
   target: CartDiscountTarget
@@ -1814,8 +1808,6 @@ input CartDiscountDraft {
   isActive: Boolean = true
   custom: CustomFieldsDraft
   key: String
-
-  "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
   stores: [ResourceIdentifierInput!]
 }
 
@@ -1862,23 +1854,16 @@ input CartDiscountTargetInput {
   totalPrice: CartDiscountTotalPriceTargetInput
 }
 
-"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
 type CartDiscountTotalPriceTarget implements CartDiscountTarget {
   type: String!
 }
 
-"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
 input CartDiscountTotalPriceTargetInput {
   dummy: String
 }
 input CartDiscountUpdateAction {
-  "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
   setStores: SetCartDiscountStores
-
-  "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
   addStore: AddCartDiscountStore
-
-  "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
   removeStore: RemoveCartDiscountStore
   changeCartPredicate: ChangeCartDiscountCartPredicate
   changeIsActive: ChangeCartDiscountIsActive
@@ -4092,7 +4077,6 @@ type DiscountedProductSearchPriceValue {
   discount: ProductDiscount
 }
 
-"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
 type DiscountedTotalPricePortion {
   discount: CartDiscount
   discountRef: Reference!
@@ -6451,7 +6435,6 @@ type Order implements Versioned & ReferenceExpandable {
   customLineItems: [CustomLineItem!]!
   totalPrice: Money!
   taxedPrice: TaxedPrice
-  "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
   discountOnTotalPrice: DiscountOnTotalPrice
   shippingAddress: Address
   billingAddress: Address
@@ -9243,7 +9226,6 @@ input RemoveCartDiscountCode {
   discountCode: ReferenceInput!
 }
 
-"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
 input RemoveCartDiscountStore {
   store: ResourceIdentifierInput!
 }
@@ -10163,7 +10145,6 @@ input SetCartDiscountKey {
   key: String
 }
 
-"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
 input SetCartDiscountStores {
   stores: [ResourceIdentifierInput!]
 }
@@ -13685,7 +13666,6 @@ type TimeType implements FieldType {
   name: String!
 }
 
-"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
 type DiscountOnTotalPrice {
   discountedAmount: BaseMoney!
   includedDiscounts: [DiscountedTotalPricePortion!]!
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnit.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnit.java
index 1437d1f7379..4a2b7ba5cf0 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnit.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnit.java
@@ -227,7 +227,7 @@ public interface BusinessUnit extends BaseResource, com.commercetools.api.models
     public List<Associate> getAssociates();
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @return inheritedAssociates
      */
     @Valid
@@ -436,7 +436,7 @@ public interface BusinessUnit extends BaseResource, com.commercetools.api.models
     public void setAssociates(final List<Associate> associates);
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param inheritedAssociates values to be set
      */
 
@@ -444,7 +444,7 @@ public interface BusinessUnit extends BaseResource, com.commercetools.api.models
     public void setInheritedAssociates(final InheritedAssociate... inheritedAssociates);
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param inheritedAssociates values to be set
      */
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnitImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnitImpl.java
index cc795cbd2eb..ea389aabbd9 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnitImpl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnitImpl.java
@@ -299,7 +299,7 @@ public java.util.List<com.commercetools.api.models.business_unit.Associate> getA
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      */
 
     public java.util.List<com.commercetools.api.models.business_unit.InheritedAssociate> getInheritedAssociates() {
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnitStatus.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnitStatus.java
index e304d20c885..6f3026c6318 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnitStatus.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/BusinessUnitStatus.java
@@ -22,7 +22,7 @@ public interface BusinessUnitStatus extends JsonEnum {
     */
     BusinessUnitStatus ACTIVE = BusinessUnitStatusEnum.ACTIVE;
     /**
-    	<p>The Business Unit cannot be used in Carts, Orders, Quote Requests, and Quotes and can only be edited using the <a href="ctp:api:endpoint:/{projectKey}/me/business-units:POST">general endpoint</a>.
+    	<p>The Business Unit cannot be used in Carts, Orders, Quote Requests, and Quotes and can only be edited using the <a href="/../api/associates-overview#through-the-general-endpoints">general endpoint</a>.
     	Status doesn't affect inheritance. Even if a parent unit is inactive, its children remain active and can inherit role assignments.</p>
 
     */
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/CompanyBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/CompanyBuilder.java
index 0fded39cd47..f168b418994 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/CompanyBuilder.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/CompanyBuilder.java
@@ -678,7 +678,7 @@ public CompanyBuilder setAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param inheritedAssociates value to be set
      * @return Builder
      */
@@ -690,7 +690,7 @@ public CompanyBuilder inheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param inheritedAssociates value to be set
      * @return Builder
      */
@@ -702,7 +702,7 @@ public CompanyBuilder inheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param inheritedAssociates value to be set
      * @return Builder
      */
@@ -717,7 +717,7 @@ public CompanyBuilder plusInheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param builder function to build the inheritedAssociates value
      * @return Builder
      */
@@ -733,7 +733,7 @@ public CompanyBuilder plusInheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param builder function to build the inheritedAssociates value
      * @return Builder
      */
@@ -747,7 +747,7 @@ public CompanyBuilder withInheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param builder function to build the inheritedAssociates value
      * @return Builder
      */
@@ -759,7 +759,7 @@ public CompanyBuilder addInheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param builder function to build the inheritedAssociates value
      * @return Builder
      */
@@ -1039,7 +1039,7 @@ public java.util.List<com.commercetools.api.models.business_unit.Associate> getA
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @return inheritedAssociates
      */
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/CompanyImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/CompanyImpl.java
index 0f99e3afa17..4a01e018067 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/CompanyImpl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/CompanyImpl.java
@@ -299,7 +299,7 @@ public java.util.List<com.commercetools.api.models.business_unit.Associate> getA
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      */
 
     public java.util.List<com.commercetools.api.models.business_unit.InheritedAssociate> getInheritedAssociates() {
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/DivisionBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/DivisionBuilder.java
index 98f15fad28e..9147c8c3c0a 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/DivisionBuilder.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/DivisionBuilder.java
@@ -678,7 +678,7 @@ public DivisionBuilder setAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param inheritedAssociates value to be set
      * @return Builder
      */
@@ -690,7 +690,7 @@ public DivisionBuilder inheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param inheritedAssociates value to be set
      * @return Builder
      */
@@ -702,7 +702,7 @@ public DivisionBuilder inheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param inheritedAssociates value to be set
      * @return Builder
      */
@@ -717,7 +717,7 @@ public DivisionBuilder plusInheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param builder function to build the inheritedAssociates value
      * @return Builder
      */
@@ -733,7 +733,7 @@ public DivisionBuilder plusInheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param builder function to build the inheritedAssociates value
      * @return Builder
      */
@@ -747,7 +747,7 @@ public DivisionBuilder withInheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param builder function to build the inheritedAssociates value
      * @return Builder
      */
@@ -759,7 +759,7 @@ public DivisionBuilder addInheritedAssociates(
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @param builder function to build the inheritedAssociates value
      * @return Builder
      */
@@ -1039,7 +1039,7 @@ public java.util.List<com.commercetools.api.models.business_unit.Associate> getA
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      * @return inheritedAssociates
      */
 
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/DivisionImpl.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/DivisionImpl.java
index cd49986e855..5324792f3b3 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/DivisionImpl.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/business_unit/DivisionImpl.java
@@ -299,7 +299,7 @@ public java.util.List<com.commercetools.api.models.business_unit.Associate> getA
     }
 
     /**
-     *  <p>Associates that are inherited from a parent Business Unit. This value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
+     *  <p>Associates that are inherited from a parent Business Unit. The value of this field is eventually consistent and is only present when the <code>associateMode</code> is set to <code>ExplicitAndFromParent</code>.</p>
      */
 
     public java.util.List<com.commercetools.api.models.business_unit.InheritedAssociate> getInheritedAssociates() {
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order/ShipmentState.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order/ShipmentState.java
index 61418d20e99..a6d982c476c 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order/ShipmentState.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/order/ShipmentState.java
@@ -11,7 +11,7 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 /**
- *  <p>Indicates the shipment status of the Parcel.</p>
+ *  <p>Indicates the shipment status of the Order.</p>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
 public interface ShipmentState extends JsonEnum {
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceType.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceType.java
index e9198b0c880..5547f39f81d 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceType.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceType.java
@@ -21,7 +21,7 @@
  * <div class=code-example>
  * <pre><code class='java'>
  *     AttributeReferenceType attributeReferenceType = AttributeReferenceType.builder()
- *             .referenceTypeId(AttributeReferenceTypeId.CART)
+ *             .referenceTypeId(AttributeReferenceTypeId.ASSOCIATE_ROLE)
  *             .build()
  * </code></pre>
  * </div>
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeBuilder.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeBuilder.java
index 0a53527230e..2d0e6db4b8c 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeBuilder.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeBuilder.java
@@ -13,7 +13,7 @@
  * <div class=code-example>
  * <pre><code class='java'>
  *     AttributeReferenceType attributeReferenceType = AttributeReferenceType.builder()
- *             .referenceTypeId(AttributeReferenceTypeId.CART)
+ *             .referenceTypeId(AttributeReferenceTypeId.ASSOCIATE_ROLE)
  *             .build()
  * </code></pre>
  * </div>
diff --git a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeId.java b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeId.java
index 9fd83692e12..38f564fc9db 100644
--- a/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeId.java
+++ b/commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeId.java
@@ -16,11 +16,26 @@
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
 public interface AttributeReferenceTypeId extends JsonEnum {
 
+    /**
+    	<p>References a <a href="ctp:api:type:AssociateRole">AssociateRole</a>.</p>
+
+    */
+    AttributeReferenceTypeId ASSOCIATE_ROLE = AttributeReferenceTypeIdEnum.ASSOCIATE_ROLE;
+    /**
+    	<p>References a <a href="ctp:api:type:BusinessUnit">BusinessUnit</a>.</p>
+
+    */
+    AttributeReferenceTypeId BUSINESS_UNIT = AttributeReferenceTypeIdEnum.BUSINESS_UNIT;
     /**
     	<p>References a <a href="ctp:api:type:Cart">Cart</a>.</p>
 
     */
     AttributeReferenceTypeId CART = AttributeReferenceTypeIdEnum.CART;
+    /**
+    	<p>References a <a href="ctp:api:type:CartDiscount">CartDiscount</a>.</p>
+
+    */
+    AttributeReferenceTypeId CART_DISCOUNT = AttributeReferenceTypeIdEnum.CART_DISCOUNT;
     /**
     	<p>References a <a href="ctp:api:type:Category">Category</a>.</p>
 
@@ -81,11 +96,26 @@ public interface AttributeReferenceTypeId extends JsonEnum {
      * possible values of AttributeReferenceTypeId
      */
     enum AttributeReferenceTypeIdEnum implements AttributeReferenceTypeId {
+        /**
+         * associate-role
+         */
+        ASSOCIATE_ROLE("associate-role"),
+
+        /**
+         * business-unit
+         */
+        BUSINESS_UNIT("business-unit"),
+
         /**
          * cart
          */
         CART("cart"),
 
+        /**
+         * cart-discount
+         */
+        CART_DISCOUNT("cart-discount"),
+
         /**
          * category
          */
diff --git a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeTest.java b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeTest.java
index 859e5662cc9..d82824fb2fe 100644
--- a/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeTest.java
+++ b/commercetools/commercetools-sdk-java-api/src/test/java-generated/com/commercetools/api/models/product_type/AttributeReferenceTypeTest.java
@@ -26,14 +26,16 @@ public void buildUnchecked(AttributeReferenceTypeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { AttributeReferenceType.builder()
                 .referenceTypeId(
-                    com.commercetools.api.models.product_type.AttributeReferenceTypeId.findEnum("cart")) } };
+                    com.commercetools.api.models.product_type.AttributeReferenceTypeId.findEnum("associate-role")) } };
     }
 
     @Test
     public void referenceTypeId() {
         AttributeReferenceType value = AttributeReferenceType.of();
-        value.setReferenceTypeId(com.commercetools.api.models.product_type.AttributeReferenceTypeId.findEnum("cart"));
+        value.setReferenceTypeId(
+            com.commercetools.api.models.product_type.AttributeReferenceTypeId.findEnum("associate-role"));
         Assertions.assertThat(value.getReferenceTypeId())
-                .isEqualTo(com.commercetools.api.models.product_type.AttributeReferenceTypeId.findEnum("cart"));
+                .isEqualTo(
+                    com.commercetools.api.models.product_type.AttributeReferenceTypeId.findEnum("associate-role"));
     }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChange.java
index c7fccd5a99c..494cb0d646e 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChange.java
@@ -24,7 +24,6 @@
  * <pre><code class='java'>
  *     AddAddressChange addAddressChange = AddAddressChange.builder()
  *             .change("{change}")
- *             .previousValue(previousValueBuilder -> previousValueBuilder)
  *             .nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
@@ -55,15 +54,6 @@ public interface AddAddressChange extends Change {
     @JsonProperty("type")
     public String getType();
 
-    /**
-     *  <p>Value before the change.</p>
-     * @return previousValue
-     */
-    @NotNull
-    @Valid
-    @JsonProperty("previousValue")
-    public Address getPreviousValue();
-
     /**
      *  <p>Value after the change.</p>
      * @return nextValue
@@ -80,13 +70,6 @@ public interface AddAddressChange extends Change {
 
     public void setChange(final String change);
 
-    /**
-     *  <p>Value before the change.</p>
-     * @param previousValue value to be set
-     */
-
-    public void setPreviousValue(final Address previousValue);
-
     /**
      *  <p>Value after the change.</p>
      * @param nextValue value to be set
@@ -110,7 +93,6 @@ public static AddAddressChange of() {
     public static AddAddressChange of(final AddAddressChange template) {
         AddAddressChangeImpl instance = new AddAddressChangeImpl();
         instance.setChange(template.getChange());
-        instance.setPreviousValue(template.getPreviousValue());
         instance.setNextValue(template.getNextValue());
         return instance;
     }
@@ -127,8 +109,6 @@ public static AddAddressChange deepCopy(@Nullable final AddAddressChange templat
         }
         AddAddressChangeImpl instance = new AddAddressChangeImpl();
         instance.setChange(template.getChange());
-        instance.setPreviousValue(
-            com.commercetools.history.models.common.Address.deepCopy(template.getPreviousValue()));
         instance.setNextValue(com.commercetools.history.models.common.Address.deepCopy(template.getNextValue()));
         return instance;
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChangeBuilder.java
index b6273807d61..97499908864 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChangeBuilder.java
@@ -15,7 +15,6 @@
  * <pre><code class='java'>
  *     AddAddressChange addAddressChange = AddAddressChange.builder()
  *             .change("{change}")
- *             .previousValue(previousValueBuilder -> previousValueBuilder)
  *             .nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
@@ -26,8 +25,6 @@ public class AddAddressChangeBuilder implements Builder<AddAddressChange> {
 
     private String change;
 
-    private com.commercetools.history.models.common.Address previousValue;
-
     private com.commercetools.history.models.common.Address nextValue;
 
     /**
@@ -41,41 +38,6 @@ public AddAddressChangeBuilder change(final String change) {
         return this;
     }
 
-    /**
-     *  <p>Value before the change.</p>
-     * @param builder function to build the previousValue value
-     * @return Builder
-     */
-
-    public AddAddressChangeBuilder previousValue(
-            Function<com.commercetools.history.models.common.AddressBuilder, com.commercetools.history.models.common.AddressBuilder> builder) {
-        this.previousValue = builder.apply(com.commercetools.history.models.common.AddressBuilder.of()).build();
-        return this;
-    }
-
-    /**
-     *  <p>Value before the change.</p>
-     * @param builder function to build the previousValue value
-     * @return Builder
-     */
-
-    public AddAddressChangeBuilder withPreviousValue(
-            Function<com.commercetools.history.models.common.AddressBuilder, com.commercetools.history.models.common.Address> builder) {
-        this.previousValue = builder.apply(com.commercetools.history.models.common.AddressBuilder.of());
-        return this;
-    }
-
-    /**
-     *  <p>Value before the change.</p>
-     * @param previousValue value to be set
-     * @return Builder
-     */
-
-    public AddAddressChangeBuilder previousValue(final com.commercetools.history.models.common.Address previousValue) {
-        this.previousValue = previousValue;
-        return this;
-    }
-
     /**
      *  <p>Value after the change.</p>
      * @param builder function to build the nextValue value
@@ -120,15 +82,6 @@ public String getChange() {
         return this.change;
     }
 
-    /**
-     *  <p>Value before the change.</p>
-     * @return previousValue
-     */
-
-    public com.commercetools.history.models.common.Address getPreviousValue() {
-        return this.previousValue;
-    }
-
     /**
      *  <p>Value after the change.</p>
      * @return nextValue
@@ -144,9 +97,8 @@ public com.commercetools.history.models.common.Address getNextValue() {
      */
     public AddAddressChange build() {
         Objects.requireNonNull(change, AddAddressChange.class + ": change is missing");
-        Objects.requireNonNull(previousValue, AddAddressChange.class + ": previousValue is missing");
         Objects.requireNonNull(nextValue, AddAddressChange.class + ": nextValue is missing");
-        return new AddAddressChangeImpl(change, previousValue, nextValue);
+        return new AddAddressChangeImpl(change, nextValue);
     }
 
     /**
@@ -154,7 +106,7 @@ public AddAddressChange build() {
      * @return AddAddressChange
      */
     public AddAddressChange buildUnchecked() {
-        return new AddAddressChangeImpl(change, previousValue, nextValue);
+        return new AddAddressChangeImpl(change, nextValue);
     }
 
     /**
@@ -173,7 +125,6 @@ public static AddAddressChangeBuilder of() {
     public static AddAddressChangeBuilder of(final AddAddressChange template) {
         AddAddressChangeBuilder builder = new AddAddressChangeBuilder();
         builder.change = template.getChange();
-        builder.previousValue = template.getPreviousValue();
         builder.nextValue = template.getNextValue();
         return builder;
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChangeImpl.java
index afd3d2f9e4a..ef3a24cb9e1 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddAddressChangeImpl.java
@@ -26,8 +26,6 @@ public class AddAddressChangeImpl implements AddAddressChange, ModelBase {
 
     private String change;
 
-    private com.commercetools.history.models.common.Address previousValue;
-
     private com.commercetools.history.models.common.Address nextValue;
 
     /**
@@ -35,10 +33,8 @@ public class AddAddressChangeImpl implements AddAddressChange, ModelBase {
      */
     @JsonCreator
     AddAddressChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final com.commercetools.history.models.common.Address previousValue,
             @JsonProperty("nextValue") final com.commercetools.history.models.common.Address nextValue) {
         this.change = change;
-        this.previousValue = previousValue;
         this.nextValue = nextValue;
         this.type = ADD_ADDRESS_CHANGE;
     }
@@ -66,14 +62,6 @@ public String getChange() {
         return this.change;
     }
 
-    /**
-     *  <p>Value before the change.</p>
-     */
-
-    public com.commercetools.history.models.common.Address getPreviousValue() {
-        return this.previousValue;
-    }
-
     /**
      *  <p>Value after the change.</p>
      */
@@ -86,10 +74,6 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.Address previousValue) {
-        this.previousValue = previousValue;
-    }
-
     public void setNextValue(final com.commercetools.history.models.common.Address nextValue) {
         this.nextValue = nextValue;
     }
@@ -106,29 +90,22 @@ public boolean equals(Object o) {
 
         return new EqualsBuilder().append(type, that.type)
                 .append(change, that.change)
-                .append(previousValue, that.previousValue)
                 .append(nextValue, that.nextValue)
                 .append(type, that.type)
                 .append(change, that.change)
-                .append(previousValue, that.previousValue)
                 .append(nextValue, that.nextValue)
                 .isEquals();
     }
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder(17, 37).append(type)
-                .append(change)
-                .append(previousValue)
-                .append(nextValue)
-                .toHashCode();
+        return new HashCodeBuilder(17, 37).append(type).append(change).append(nextValue).toHashCode();
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("type", type)
                 .append("change", change)
-                .append("previousValue", previousValue)
                 .append("nextValue", nextValue)
                 .build();
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChange.java
index e292e0f7366..f67e637573a 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChange.java
@@ -8,7 +8,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.common.ChannelRole;
+import com.commercetools.history.models.common.ChannelRoleEnum;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -60,7 +60,7 @@ public interface AddChannelRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("previousValue")
-    public List<ChannelRole> getPreviousValue();
+    public List<ChannelRoleEnum> getPreviousValue();
 
     /**
      *  <p>Value after the change.</p>
@@ -68,7 +68,7 @@ public interface AddChannelRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("nextValue")
-    public List<ChannelRole> getNextValue();
+    public List<ChannelRoleEnum> getNextValue();
 
     /**
      * set change
@@ -83,14 +83,14 @@ public interface AddChannelRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setPreviousValue(final ChannelRole... previousValue);
+    public void setPreviousValue(final ChannelRoleEnum... previousValue);
 
     /**
      *  <p>Value before the change.</p>
      * @param previousValue values to be set
      */
 
-    public void setPreviousValue(final List<ChannelRole> previousValue);
+    public void setPreviousValue(final List<ChannelRoleEnum> previousValue);
 
     /**
      *  <p>Value after the change.</p>
@@ -98,14 +98,14 @@ public interface AddChannelRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setNextValue(final ChannelRole... nextValue);
+    public void setNextValue(final ChannelRoleEnum... nextValue);
 
     /**
      *  <p>Value after the change.</p>
      * @param nextValue values to be set
      */
 
-    public void setNextValue(final List<ChannelRole> nextValue);
+    public void setNextValue(final List<ChannelRoleEnum> nextValue);
 
     /**
      * factory method
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeBuilder.java
index 26c60d857a7..53fa811268b 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeBuilder.java
@@ -25,9 +25,9 @@ public class AddChannelRolesChangeBuilder implements Builder<AddChannelRolesChan
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue;
 
     /**
      * set the value to the change
@@ -47,7 +47,7 @@ public AddChannelRolesChangeBuilder change(final String change) {
      */
 
     public AddChannelRolesChangeBuilder previousValue(
-            final com.commercetools.history.models.common.ChannelRole... previousValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
         return this;
     }
@@ -59,7 +59,7 @@ public AddChannelRolesChangeBuilder previousValue(
      */
 
     public AddChannelRolesChangeBuilder previousValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue) {
         this.previousValue = previousValue;
         return this;
     }
@@ -71,7 +71,7 @@ public AddChannelRolesChangeBuilder previousValue(
      */
 
     public AddChannelRolesChangeBuilder plusPreviousValue(
-            final com.commercetools.history.models.common.ChannelRole... previousValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         if (this.previousValue == null) {
             this.previousValue = new ArrayList<>();
         }
@@ -86,7 +86,7 @@ public AddChannelRolesChangeBuilder plusPreviousValue(
      */
 
     public AddChannelRolesChangeBuilder nextValue(
-            final com.commercetools.history.models.common.ChannelRole... nextValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
         return this;
     }
@@ -98,7 +98,7 @@ public AddChannelRolesChangeBuilder nextValue(
      */
 
     public AddChannelRolesChangeBuilder nextValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -110,7 +110,7 @@ public AddChannelRolesChangeBuilder nextValue(
      */
 
     public AddChannelRolesChangeBuilder plusNextValue(
-            final com.commercetools.history.models.common.ChannelRole... nextValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         if (this.nextValue == null) {
             this.nextValue = new ArrayList<>();
         }
@@ -132,7 +132,7 @@ public String getChange() {
      * @return previousValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -141,7 +141,7 @@ public java.util.List<com.commercetools.history.models.common.ChannelRole> getPr
      * @return nextValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeImpl.java
index 002aa0cbd7d..eddd678de1a 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeImpl.java
@@ -26,17 +26,17 @@ public class AddChannelRolesChangeImpl implements AddChannelRolesChange, ModelBa
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue;
 
     /**
      * create instance with all properties
      */
     @JsonCreator
     AddChannelRolesChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue,
-            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue,
+            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.change = change;
         this.previousValue = previousValue;
         this.nextValue = nextValue;
@@ -70,7 +70,7 @@ public String getChange() {
      *  <p>Value before the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -78,7 +78,7 @@ public java.util.List<com.commercetools.history.models.common.ChannelRole> getPr
      *  <p>Value after the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
@@ -86,20 +86,20 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.ChannelRole... previousValue) {
+    public void setPreviousValue(final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
     }
 
     public void setPreviousValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue) {
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.ChannelRole... nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
     }
 
-    public void setNextValue(final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+    public void setNextValue(final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChange.java
index 1d3a4b24ff5..ed85f472d43 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChange.java
@@ -9,7 +9,7 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.change_value.LocalizedEnumValue;
+import com.commercetools.history.models.common.AttributeLocalizedEnumValue;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -67,7 +67,7 @@ public interface AddLocalizedEnumValueChange extends Change {
     @NotNull
     @Valid
     @JsonProperty("nextValue")
-    public LocalizedEnumValue getNextValue();
+    public AttributeLocalizedEnumValue getNextValue();
 
     /**
      *  <p>Name of the updated FieldDefinition; only present on changes to Types.</p>
@@ -97,7 +97,7 @@ public interface AddLocalizedEnumValueChange extends Change {
      * @param nextValue value to be set
      */
 
-    public void setNextValue(final LocalizedEnumValue nextValue);
+    public void setNextValue(final AttributeLocalizedEnumValue nextValue);
 
     /**
      *  <p>Name of the updated FieldDefinition; only present on changes to Types.</p>
@@ -148,7 +148,7 @@ public static AddLocalizedEnumValueChange deepCopy(@Nullable final AddLocalizedE
         AddLocalizedEnumValueChangeImpl instance = new AddLocalizedEnumValueChangeImpl();
         instance.setChange(template.getChange());
         instance.setNextValue(
-            com.commercetools.history.models.change_value.LocalizedEnumValue.deepCopy(template.getNextValue()));
+            com.commercetools.history.models.common.AttributeLocalizedEnumValue.deepCopy(template.getNextValue()));
         instance.setFieldName(template.getFieldName());
         instance.setAttributeName(template.getAttributeName());
         return instance;
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeBuilder.java
index f09217eafaa..fa32ee5d186 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeBuilder.java
@@ -27,7 +27,7 @@ public class AddLocalizedEnumValueChangeBuilder implements Builder<AddLocalizedE
 
     private String change;
 
-    private com.commercetools.history.models.change_value.LocalizedEnumValue nextValue;
+    private com.commercetools.history.models.common.AttributeLocalizedEnumValue nextValue;
 
     private String fieldName;
 
@@ -51,8 +51,8 @@ public AddLocalizedEnumValueChangeBuilder change(final String change) {
      */
 
     public AddLocalizedEnumValueChangeBuilder nextValue(
-            Function<com.commercetools.history.models.change_value.LocalizedEnumValueBuilder, com.commercetools.history.models.change_value.LocalizedEnumValueBuilder> builder) {
-        this.nextValue = builder.apply(com.commercetools.history.models.change_value.LocalizedEnumValueBuilder.of())
+            Function<com.commercetools.history.models.common.AttributeLocalizedEnumValueBuilder, com.commercetools.history.models.common.AttributeLocalizedEnumValueBuilder> builder) {
+        this.nextValue = builder.apply(com.commercetools.history.models.common.AttributeLocalizedEnumValueBuilder.of())
                 .build();
         return this;
     }
@@ -64,8 +64,8 @@ public AddLocalizedEnumValueChangeBuilder nextValue(
      */
 
     public AddLocalizedEnumValueChangeBuilder withNextValue(
-            Function<com.commercetools.history.models.change_value.LocalizedEnumValueBuilder, com.commercetools.history.models.change_value.LocalizedEnumValue> builder) {
-        this.nextValue = builder.apply(com.commercetools.history.models.change_value.LocalizedEnumValueBuilder.of());
+            Function<com.commercetools.history.models.common.AttributeLocalizedEnumValueBuilder, com.commercetools.history.models.common.AttributeLocalizedEnumValue> builder) {
+        this.nextValue = builder.apply(com.commercetools.history.models.common.AttributeLocalizedEnumValueBuilder.of());
         return this;
     }
 
@@ -76,7 +76,7 @@ public AddLocalizedEnumValueChangeBuilder withNextValue(
      */
 
     public AddLocalizedEnumValueChangeBuilder nextValue(
-            final com.commercetools.history.models.change_value.LocalizedEnumValue nextValue) {
+            final com.commercetools.history.models.common.AttributeLocalizedEnumValue nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -117,7 +117,7 @@ public String getChange() {
      * @return nextValue
      */
 
-    public com.commercetools.history.models.change_value.LocalizedEnumValue getNextValue() {
+    public com.commercetools.history.models.common.AttributeLocalizedEnumValue getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeImpl.java
index 2758594b16b..c52b6c830dd 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeImpl.java
@@ -30,7 +30,7 @@ public class AddLocalizedEnumValueChangeImpl implements AddLocalizedEnumValueCha
 
     private String change;
 
-    private com.commercetools.history.models.change_value.LocalizedEnumValue nextValue;
+    private com.commercetools.history.models.common.AttributeLocalizedEnumValue nextValue;
 
     private String fieldName;
 
@@ -41,7 +41,7 @@ public class AddLocalizedEnumValueChangeImpl implements AddLocalizedEnumValueCha
      */
     @JsonCreator
     AddLocalizedEnumValueChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("nextValue") final com.commercetools.history.models.change_value.LocalizedEnumValue nextValue,
+            @JsonProperty("nextValue") final com.commercetools.history.models.common.AttributeLocalizedEnumValue nextValue,
             @JsonProperty("fieldName") final String fieldName,
             @JsonProperty("attributeName") final String attributeName) {
         this.change = change;
@@ -78,7 +78,7 @@ public String getChange() {
      *  <p>Value after the change.</p>
      */
 
-    public com.commercetools.history.models.change_value.LocalizedEnumValue getNextValue() {
+    public com.commercetools.history.models.common.AttributeLocalizedEnumValue getNextValue() {
         return this.nextValue;
     }
 
@@ -102,7 +102,7 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setNextValue(final com.commercetools.history.models.change_value.LocalizedEnumValue nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.AttributeLocalizedEnumValue nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChange.java
index 5f2068f7f15..45fb1e269e4 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChange.java
@@ -24,7 +24,6 @@
  * <pre><code class='java'>
  *     AddLocationChange addLocationChange = AddLocationChange.builder()
  *             .change("{change}")
- *             .previousValue(previousValueBuilder -> previousValueBuilder)
  *             .nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
@@ -55,15 +54,6 @@ public interface AddLocationChange extends Change {
     @JsonProperty("change")
     public String getChange();
 
-    /**
-     *  <p>Value before the change.</p>
-     * @return previousValue
-     */
-    @NotNull
-    @Valid
-    @JsonProperty("previousValue")
-    public Location getPreviousValue();
-
     /**
      *  <p>Value after the change.</p>
      * @return nextValue
@@ -80,13 +70,6 @@ public interface AddLocationChange extends Change {
 
     public void setChange(final String change);
 
-    /**
-     *  <p>Value before the change.</p>
-     * @param previousValue value to be set
-     */
-
-    public void setPreviousValue(final Location previousValue);
-
     /**
      *  <p>Value after the change.</p>
      * @param nextValue value to be set
@@ -110,7 +93,6 @@ public static AddLocationChange of() {
     public static AddLocationChange of(final AddLocationChange template) {
         AddLocationChangeImpl instance = new AddLocationChangeImpl();
         instance.setChange(template.getChange());
-        instance.setPreviousValue(template.getPreviousValue());
         instance.setNextValue(template.getNextValue());
         return instance;
     }
@@ -127,8 +109,6 @@ public static AddLocationChange deepCopy(@Nullable final AddLocationChange templ
         }
         AddLocationChangeImpl instance = new AddLocationChangeImpl();
         instance.setChange(template.getChange());
-        instance.setPreviousValue(
-            com.commercetools.history.models.common.Location.deepCopy(template.getPreviousValue()));
         instance.setNextValue(com.commercetools.history.models.common.Location.deepCopy(template.getNextValue()));
         return instance;
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChangeBuilder.java
index e4cf396cc8b..b54f177ab09 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChangeBuilder.java
@@ -15,7 +15,6 @@
  * <pre><code class='java'>
  *     AddLocationChange addLocationChange = AddLocationChange.builder()
  *             .change("{change}")
- *             .previousValue(previousValueBuilder -> previousValueBuilder)
  *             .nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
@@ -26,8 +25,6 @@ public class AddLocationChangeBuilder implements Builder<AddLocationChange> {
 
     private String change;
 
-    private com.commercetools.history.models.common.Location previousValue;
-
     private com.commercetools.history.models.common.Location nextValue;
 
     /**
@@ -41,42 +38,6 @@ public AddLocationChangeBuilder change(final String change) {
         return this;
     }
 
-    /**
-     *  <p>Value before the change.</p>
-     * @param builder function to build the previousValue value
-     * @return Builder
-     */
-
-    public AddLocationChangeBuilder previousValue(
-            Function<com.commercetools.history.models.common.LocationBuilder, com.commercetools.history.models.common.LocationBuilder> builder) {
-        this.previousValue = builder.apply(com.commercetools.history.models.common.LocationBuilder.of()).build();
-        return this;
-    }
-
-    /**
-     *  <p>Value before the change.</p>
-     * @param builder function to build the previousValue value
-     * @return Builder
-     */
-
-    public AddLocationChangeBuilder withPreviousValue(
-            Function<com.commercetools.history.models.common.LocationBuilder, com.commercetools.history.models.common.Location> builder) {
-        this.previousValue = builder.apply(com.commercetools.history.models.common.LocationBuilder.of());
-        return this;
-    }
-
-    /**
-     *  <p>Value before the change.</p>
-     * @param previousValue value to be set
-     * @return Builder
-     */
-
-    public AddLocationChangeBuilder previousValue(
-            final com.commercetools.history.models.common.Location previousValue) {
-        this.previousValue = previousValue;
-        return this;
-    }
-
     /**
      *  <p>Value after the change.</p>
      * @param builder function to build the nextValue value
@@ -121,15 +82,6 @@ public String getChange() {
         return this.change;
     }
 
-    /**
-     *  <p>Value before the change.</p>
-     * @return previousValue
-     */
-
-    public com.commercetools.history.models.common.Location getPreviousValue() {
-        return this.previousValue;
-    }
-
     /**
      *  <p>Value after the change.</p>
      * @return nextValue
@@ -145,9 +97,8 @@ public com.commercetools.history.models.common.Location getNextValue() {
      */
     public AddLocationChange build() {
         Objects.requireNonNull(change, AddLocationChange.class + ": change is missing");
-        Objects.requireNonNull(previousValue, AddLocationChange.class + ": previousValue is missing");
         Objects.requireNonNull(nextValue, AddLocationChange.class + ": nextValue is missing");
-        return new AddLocationChangeImpl(change, previousValue, nextValue);
+        return new AddLocationChangeImpl(change, nextValue);
     }
 
     /**
@@ -155,7 +106,7 @@ public AddLocationChange build() {
      * @return AddLocationChange
      */
     public AddLocationChange buildUnchecked() {
-        return new AddLocationChangeImpl(change, previousValue, nextValue);
+        return new AddLocationChangeImpl(change, nextValue);
     }
 
     /**
@@ -174,7 +125,6 @@ public static AddLocationChangeBuilder of() {
     public static AddLocationChangeBuilder of(final AddLocationChange template) {
         AddLocationChangeBuilder builder = new AddLocationChangeBuilder();
         builder.change = template.getChange();
-        builder.previousValue = template.getPreviousValue();
         builder.nextValue = template.getNextValue();
         return builder;
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChangeImpl.java
index 7a79c3f1b1b..4b3a12ae471 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddLocationChangeImpl.java
@@ -26,8 +26,6 @@ public class AddLocationChangeImpl implements AddLocationChange, ModelBase {
 
     private String change;
 
-    private com.commercetools.history.models.common.Location previousValue;
-
     private com.commercetools.history.models.common.Location nextValue;
 
     /**
@@ -35,10 +33,8 @@ public class AddLocationChangeImpl implements AddLocationChange, ModelBase {
      */
     @JsonCreator
     AddLocationChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final com.commercetools.history.models.common.Location previousValue,
             @JsonProperty("nextValue") final com.commercetools.history.models.common.Location nextValue) {
         this.change = change;
-        this.previousValue = previousValue;
         this.nextValue = nextValue;
         this.type = ADD_LOCATION_CHANGE;
     }
@@ -66,14 +62,6 @@ public String getChange() {
         return this.change;
     }
 
-    /**
-     *  <p>Value before the change.</p>
-     */
-
-    public com.commercetools.history.models.common.Location getPreviousValue() {
-        return this.previousValue;
-    }
-
     /**
      *  <p>Value after the change.</p>
      */
@@ -86,10 +74,6 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.Location previousValue) {
-        this.previousValue = previousValue;
-    }
-
     public void setNextValue(final com.commercetools.history.models.common.Location nextValue) {
         this.nextValue = nextValue;
     }
@@ -106,29 +90,22 @@ public boolean equals(Object o) {
 
         return new EqualsBuilder().append(type, that.type)
                 .append(change, that.change)
-                .append(previousValue, that.previousValue)
                 .append(nextValue, that.nextValue)
                 .append(type, that.type)
                 .append(change, that.change)
-                .append(previousValue, that.previousValue)
                 .append(nextValue, that.nextValue)
                 .isEquals();
     }
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder(17, 37).append(type)
-                .append(change)
-                .append(previousValue)
-                .append(nextValue)
-                .toHashCode();
+        return new HashCodeBuilder(17, 37).append(type).append(change).append(nextValue).toHashCode();
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("type", type)
                 .append("change", change)
-                .append("previousValue", previousValue)
                 .append("nextValue", nextValue)
                 .build();
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChange.java
index f92f0f1c210..4d9f231039a 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChange.java
@@ -9,7 +9,7 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.change_value.EnumValue;
+import com.commercetools.history.models.common.AttributePlainEnumValue;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -62,7 +62,7 @@ public interface AddPlainEnumValueChange extends Change {
     @NotNull
     @Valid
     @JsonProperty("nextValue")
-    public EnumValue getNextValue();
+    public AttributePlainEnumValue getNextValue();
 
     /**
      *  <p>Name of the updated AttributeDefinition.</p>
@@ -84,7 +84,7 @@ public interface AddPlainEnumValueChange extends Change {
      * @param nextValue value to be set
      */
 
-    public void setNextValue(final EnumValue nextValue);
+    public void setNextValue(final AttributePlainEnumValue nextValue);
 
     /**
      *  <p>Name of the updated AttributeDefinition.</p>
@@ -127,7 +127,7 @@ public static AddPlainEnumValueChange deepCopy(@Nullable final AddPlainEnumValue
         AddPlainEnumValueChangeImpl instance = new AddPlainEnumValueChangeImpl();
         instance.setChange(template.getChange());
         instance.setNextValue(
-            com.commercetools.history.models.change_value.EnumValue.deepCopy(template.getNextValue()));
+            com.commercetools.history.models.common.AttributePlainEnumValue.deepCopy(template.getNextValue()));
         instance.setAttributeName(template.getAttributeName());
         return instance;
     }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeBuilder.java
index 8722be97fb5..9db77ba52a4 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeBuilder.java
@@ -26,7 +26,7 @@ public class AddPlainEnumValueChangeBuilder implements Builder<AddPlainEnumValue
 
     private String change;
 
-    private com.commercetools.history.models.change_value.EnumValue nextValue;
+    private com.commercetools.history.models.common.AttributePlainEnumValue nextValue;
 
     private String attributeName;
 
@@ -48,8 +48,9 @@ public AddPlainEnumValueChangeBuilder change(final String change) {
      */
 
     public AddPlainEnumValueChangeBuilder nextValue(
-            Function<com.commercetools.history.models.change_value.EnumValueBuilder, com.commercetools.history.models.change_value.EnumValueBuilder> builder) {
-        this.nextValue = builder.apply(com.commercetools.history.models.change_value.EnumValueBuilder.of()).build();
+            Function<com.commercetools.history.models.common.AttributePlainEnumValueBuilder, com.commercetools.history.models.common.AttributePlainEnumValueBuilder> builder) {
+        this.nextValue = builder.apply(com.commercetools.history.models.common.AttributePlainEnumValueBuilder.of())
+                .build();
         return this;
     }
 
@@ -60,8 +61,8 @@ public AddPlainEnumValueChangeBuilder nextValue(
      */
 
     public AddPlainEnumValueChangeBuilder withNextValue(
-            Function<com.commercetools.history.models.change_value.EnumValueBuilder, com.commercetools.history.models.change_value.EnumValue> builder) {
-        this.nextValue = builder.apply(com.commercetools.history.models.change_value.EnumValueBuilder.of());
+            Function<com.commercetools.history.models.common.AttributePlainEnumValueBuilder, com.commercetools.history.models.common.AttributePlainEnumValue> builder) {
+        this.nextValue = builder.apply(com.commercetools.history.models.common.AttributePlainEnumValueBuilder.of());
         return this;
     }
 
@@ -72,7 +73,7 @@ public AddPlainEnumValueChangeBuilder withNextValue(
      */
 
     public AddPlainEnumValueChangeBuilder nextValue(
-            final com.commercetools.history.models.change_value.EnumValue nextValue) {
+            final com.commercetools.history.models.common.AttributePlainEnumValue nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -102,7 +103,7 @@ public String getChange() {
      * @return nextValue
      */
 
-    public com.commercetools.history.models.change_value.EnumValue getNextValue() {
+    public com.commercetools.history.models.common.AttributePlainEnumValue getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeImpl.java
index 0fab6bf2e19..939b2aadc73 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeImpl.java
@@ -26,7 +26,7 @@ public class AddPlainEnumValueChangeImpl implements AddPlainEnumValueChange, Mod
 
     private String change;
 
-    private com.commercetools.history.models.change_value.EnumValue nextValue;
+    private com.commercetools.history.models.common.AttributePlainEnumValue nextValue;
 
     private String attributeName;
 
@@ -35,7 +35,7 @@ public class AddPlainEnumValueChangeImpl implements AddPlainEnumValueChange, Mod
      */
     @JsonCreator
     AddPlainEnumValueChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("nextValue") final com.commercetools.history.models.change_value.EnumValue nextValue,
+            @JsonProperty("nextValue") final com.commercetools.history.models.common.AttributePlainEnumValue nextValue,
             @JsonProperty("attributeName") final String attributeName) {
         this.change = change;
         this.nextValue = nextValue;
@@ -70,7 +70,7 @@ public String getChange() {
      *  <p>Value after the change.</p>
      */
 
-    public com.commercetools.history.models.change_value.EnumValue getNextValue() {
+    public com.commercetools.history.models.common.AttributePlainEnumValue getNextValue() {
         return this.nextValue;
     }
 
@@ -86,7 +86,7 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setNextValue(final com.commercetools.history.models.change_value.EnumValue nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.AttributePlainEnumValue nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChange.java
index 881c5df356d..fa39a7effa5 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChange.java
@@ -8,7 +8,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.common.StateRole;
+import com.commercetools.history.models.common.StateRoleEnum;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -60,7 +60,7 @@ public interface AddStateRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("previousValue")
-    public List<StateRole> getPreviousValue();
+    public List<StateRoleEnum> getPreviousValue();
 
     /**
      *  <p>Value after the change.</p>
@@ -68,7 +68,7 @@ public interface AddStateRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("nextValue")
-    public List<StateRole> getNextValue();
+    public List<StateRoleEnum> getNextValue();
 
     /**
      * set change
@@ -83,14 +83,14 @@ public interface AddStateRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setPreviousValue(final StateRole... previousValue);
+    public void setPreviousValue(final StateRoleEnum... previousValue);
 
     /**
      *  <p>Value before the change.</p>
      * @param previousValue values to be set
      */
 
-    public void setPreviousValue(final List<StateRole> previousValue);
+    public void setPreviousValue(final List<StateRoleEnum> previousValue);
 
     /**
      *  <p>Value after the change.</p>
@@ -98,14 +98,14 @@ public interface AddStateRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setNextValue(final StateRole... nextValue);
+    public void setNextValue(final StateRoleEnum... nextValue);
 
     /**
      *  <p>Value after the change.</p>
      * @param nextValue values to be set
      */
 
-    public void setNextValue(final List<StateRole> nextValue);
+    public void setNextValue(final List<StateRoleEnum> nextValue);
 
     /**
      * factory method
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChangeBuilder.java
index f9bd24d6800..218825451fc 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChangeBuilder.java
@@ -25,9 +25,9 @@ public class AddStateRolesChangeBuilder implements Builder<AddStateRolesChange>
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue;
 
     /**
      * set the value to the change
@@ -47,7 +47,7 @@ public AddStateRolesChangeBuilder change(final String change) {
      */
 
     public AddStateRolesChangeBuilder previousValue(
-            final com.commercetools.history.models.common.StateRole... previousValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
         return this;
     }
@@ -59,7 +59,7 @@ public AddStateRolesChangeBuilder previousValue(
      */
 
     public AddStateRolesChangeBuilder previousValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue) {
         this.previousValue = previousValue;
         return this;
     }
@@ -71,7 +71,7 @@ public AddStateRolesChangeBuilder previousValue(
      */
 
     public AddStateRolesChangeBuilder plusPreviousValue(
-            final com.commercetools.history.models.common.StateRole... previousValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         if (this.previousValue == null) {
             this.previousValue = new ArrayList<>();
         }
@@ -85,7 +85,8 @@ public AddStateRolesChangeBuilder plusPreviousValue(
      * @return Builder
      */
 
-    public AddStateRolesChangeBuilder nextValue(final com.commercetools.history.models.common.StateRole... nextValue) {
+    public AddStateRolesChangeBuilder nextValue(
+            final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
         return this;
     }
@@ -97,7 +98,7 @@ public AddStateRolesChangeBuilder nextValue(final com.commercetools.history.mode
      */
 
     public AddStateRolesChangeBuilder nextValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -109,7 +110,7 @@ public AddStateRolesChangeBuilder nextValue(
      */
 
     public AddStateRolesChangeBuilder plusNextValue(
-            final com.commercetools.history.models.common.StateRole... nextValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         if (this.nextValue == null) {
             this.nextValue = new ArrayList<>();
         }
@@ -131,7 +132,7 @@ public String getChange() {
      * @return previousValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -140,7 +141,7 @@ public java.util.List<com.commercetools.history.models.common.StateRole> getPrev
      * @return nextValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChangeImpl.java
index 180a6eb8436..fa5196d5613 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/AddStateRolesChangeImpl.java
@@ -26,17 +26,17 @@ public class AddStateRolesChangeImpl implements AddStateRolesChange, ModelBase {
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue;
 
     /**
      * create instance with all properties
      */
     @JsonCreator
     AddStateRolesChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.StateRole> previousValue,
-            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue,
+            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.change = change;
         this.previousValue = previousValue;
         this.nextValue = nextValue;
@@ -70,7 +70,7 @@ public String getChange() {
      *  <p>Value before the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -78,7 +78,7 @@ public java.util.List<com.commercetools.history.models.common.StateRole> getPrev
      *  <p>Value after the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
@@ -86,20 +86,20 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.StateRole... previousValue) {
+    public void setPreviousValue(final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
     }
 
     public void setPreviousValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue) {
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.StateRole... nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
     }
 
-    public void setNextValue(final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+    public void setNextValue(final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/Change.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/Change.java
index 632b9912bef..cd62449c6de 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/Change.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/Change.java
@@ -23,7 +23,6 @@
  * <pre><code class='java'>
  *     Change change = Change.addAddressChangeBuilder()
  *             change("{change}")
- *             previousValue(previousValueBuilder -> previousValueBuilder)
  *             nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeDescriptionChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeDescriptionChange.java
index db643a89b80..a56fcd164cc 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeDescriptionChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeDescriptionChange.java
@@ -14,11 +14,7 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 /**
- *  <p>Change triggered by the following update actions:</p>
- *  <ul>
- *   <li>Change Description on Channels.</li>
- *   <li>Change Description on Product Types.</li>
- *  </ul>
+ *  <p>Change triggered by the Change Description update action.</p>
  *
  * <hr>
  * Example to create an instance using the builder pattern
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeDescriptionChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeDescriptionChangeImpl.java
index 39363d5c2cf..106a91a0d21 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeDescriptionChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeDescriptionChangeImpl.java
@@ -17,11 +17,7 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- *  <p>Change triggered by the following update actions:</p>
- *  <ul>
- *   <li>Change Description on Channels.</li>
- *   <li>Change Description on Product Types.</li>
- *  </ul>
+ *  <p>Change triggered by the Change Description update action.</p>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
 public class ChangeDescriptionChangeImpl implements ChangeDescriptionChange, ModelBase {
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChange.java
index dd5c829de54..0e8b4f78d6a 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChange.java
@@ -16,11 +16,7 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 /**
- *  <p>Change triggered by the following update actions:</p>
- *  <ul>
- *   <li>Change Description on Product Types.</li>
- *   <li>Change Description on Channels.</li>
- *  </ul>
+ *  <p>Change triggered by the Change Description update action.</p>
  *
  * <hr>
  * Example to create an instance using the builder pattern
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChangeImpl.java
index d2b0e8e0408..36b04f552a5 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedDescriptionChangeImpl.java
@@ -17,11 +17,7 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- *  <p>Change triggered by the following update actions:</p>
- *  <ul>
- *   <li>Change Description on Product Types.</li>
- *   <li>Change Description on Channels.</li>
- *  </ul>
+ *  <p>Change triggered by the Change Description update action.</p>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
 public class ChangeLocalizedDescriptionChangeImpl implements ChangeLocalizedDescriptionChange, ModelBase {
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChange.java
index aced0b6d76b..9c29e88ed83 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChange.java
@@ -21,14 +21,10 @@
  *   <li>Change Name on Cart Discounts.</li>
  *   <li>Change Name on Categories.</li>
  *   <li>Change Name on Channels.</li>
- *   <li>Change Name on Customer Groups.</li>
  *   <li>Change Name on Products.</li>
  *   <li>Change Name on Product Discounts.</li>
  *   <li>Change Name on Product Selections.</li>
- *   <li>Change Name on Product Types.</li>
  *   <li>Change Name on Shopping Lists.</li>
- *   <li>Change Name on Tax Categories.</li>
- *   <li>Change Name on Types.</li>
  *   <li>Change Name on Zones.</li>
  *  </ul>
  *
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChangeImpl.java
index ccb5b2d5efb..8713edf244b 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeLocalizedNameChangeImpl.java
@@ -22,14 +22,10 @@
  *   <li>Change Name on Cart Discounts.</li>
  *   <li>Change Name on Categories.</li>
  *   <li>Change Name on Channels.</li>
- *   <li>Change Name on Customer Groups.</li>
  *   <li>Change Name on Products.</li>
  *   <li>Change Name on Product Discounts.</li>
  *   <li>Change Name on Product Selections.</li>
- *   <li>Change Name on Product Types.</li>
  *   <li>Change Name on Shopping Lists.</li>
- *   <li>Change Name on Tax Categories.</li>
- *   <li>Change Name on Types.</li>
  *   <li>Change Name on Zones.</li>
  *  </ul>
  */
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeNameChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeNameChange.java
index da84ea1aac6..ee78c9991eb 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeNameChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeNameChange.java
@@ -16,17 +16,9 @@
 /**
  *  <p>Change triggered by the following update actions:</p>
  *  <ul>
- *   <li>Change Name on Cart Discounts.</li>
- *   <li>Change Name on Categories.</li>
- *   <li>Change Name on Channels.</li>
  *   <li>Change Name on Customer Groups.</li>
- *   <li>Change Name on Products.</li>
- *   <li>Change Name on Product Discounts.</li>
- *   <li>Change Name on Product Selections.</li>
  *   <li>Change Name on Product Types.</li>
- *   <li>Change Name on Shopping Lists.</li>
  *   <li>Change Name on Tax Categories.</li>
- *   <li>Change Name on Types.</li>
  *   <li>Change Name on Zones.</li>
  *  </ul>
  *
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeNameChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeNameChangeImpl.java
index ce09de89243..8912e912335 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeNameChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeNameChangeImpl.java
@@ -19,17 +19,9 @@
 /**
  *  <p>Change triggered by the following update actions:</p>
  *  <ul>
- *   <li>Change Name on Cart Discounts.</li>
- *   <li>Change Name on Categories.</li>
- *   <li>Change Name on Channels.</li>
  *   <li>Change Name on Customer Groups.</li>
- *   <li>Change Name on Products.</li>
- *   <li>Change Name on Product Discounts.</li>
- *   <li>Change Name on Product Selections.</li>
  *   <li>Change Name on Product Types.</li>
- *   <li>Change Name on Shopping Lists.</li>
  *   <li>Change Name on Tax Categories.</li>
- *   <li>Change Name on Types.</li>
  *   <li>Change Name on Zones.</li>
  *  </ul>
  */
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChange.java
index dd58a4f834a..be7159e17d5 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChange.java
@@ -8,7 +8,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.common.StateType;
+import com.commercetools.history.models.common.StateTypeEnum;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -23,8 +23,8 @@
  * <pre><code class='java'>
  *     ChangeStateTypeChange changeStateTypeChange = ChangeStateTypeChange.builder()
  *             .change("{change}")
- *             .previousValue(StateType.ORDER_STATE)
- *             .nextValue(StateType.ORDER_STATE)
+ *             .previousValue(StateTypeEnum.ORDER_STATE)
+ *             .nextValue(StateTypeEnum.ORDER_STATE)
  *             .build()
  * </code></pre>
  * </div>
@@ -60,7 +60,7 @@ public interface ChangeStateTypeChange extends Change {
      */
     @NotNull
     @JsonProperty("previousValue")
-    public StateType getPreviousValue();
+    public StateTypeEnum getPreviousValue();
 
     /**
      *  <p>Value after the change.</p>
@@ -68,7 +68,7 @@ public interface ChangeStateTypeChange extends Change {
      */
     @NotNull
     @JsonProperty("nextValue")
-    public StateType getNextValue();
+    public StateTypeEnum getNextValue();
 
     /**
      * set change
@@ -82,14 +82,14 @@ public interface ChangeStateTypeChange extends Change {
      * @param previousValue value to be set
      */
 
-    public void setPreviousValue(final StateType previousValue);
+    public void setPreviousValue(final StateTypeEnum previousValue);
 
     /**
      *  <p>Value after the change.</p>
      * @param nextValue value to be set
      */
 
-    public void setNextValue(final StateType nextValue);
+    public void setNextValue(final StateTypeEnum nextValue);
 
     /**
      * factory method
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeBuilder.java
index 423499157d2..252fd2ed878 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeBuilder.java
@@ -14,8 +14,8 @@
  * <pre><code class='java'>
  *     ChangeStateTypeChange changeStateTypeChange = ChangeStateTypeChange.builder()
  *             .change("{change}")
- *             .previousValue(StateType.ORDER_STATE)
- *             .nextValue(StateType.ORDER_STATE)
+ *             .previousValue(StateTypeEnum.ORDER_STATE)
+ *             .nextValue(StateTypeEnum.ORDER_STATE)
  *             .build()
  * </code></pre>
  * </div>
@@ -25,9 +25,9 @@ public class ChangeStateTypeChangeBuilder implements Builder<ChangeStateTypeChan
 
     private String change;
 
-    private com.commercetools.history.models.common.StateType previousValue;
+    private com.commercetools.history.models.common.StateTypeEnum previousValue;
 
-    private com.commercetools.history.models.common.StateType nextValue;
+    private com.commercetools.history.models.common.StateTypeEnum nextValue;
 
     /**
      * set the value to the change
@@ -47,7 +47,7 @@ public ChangeStateTypeChangeBuilder change(final String change) {
      */
 
     public ChangeStateTypeChangeBuilder previousValue(
-            final com.commercetools.history.models.common.StateType previousValue) {
+            final com.commercetools.history.models.common.StateTypeEnum previousValue) {
         this.previousValue = previousValue;
         return this;
     }
@@ -58,7 +58,8 @@ public ChangeStateTypeChangeBuilder previousValue(
      * @return Builder
      */
 
-    public ChangeStateTypeChangeBuilder nextValue(final com.commercetools.history.models.common.StateType nextValue) {
+    public ChangeStateTypeChangeBuilder nextValue(
+            final com.commercetools.history.models.common.StateTypeEnum nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -77,7 +78,7 @@ public String getChange() {
      * @return previousValue
      */
 
-    public com.commercetools.history.models.common.StateType getPreviousValue() {
+    public com.commercetools.history.models.common.StateTypeEnum getPreviousValue() {
         return this.previousValue;
     }
 
@@ -86,7 +87,7 @@ public com.commercetools.history.models.common.StateType getPreviousValue() {
      * @return nextValue
      */
 
-    public com.commercetools.history.models.common.StateType getNextValue() {
+    public com.commercetools.history.models.common.StateTypeEnum getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeImpl.java
index efc928f9bac..596a41217ce 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeImpl.java
@@ -26,17 +26,17 @@ public class ChangeStateTypeChangeImpl implements ChangeStateTypeChange, ModelBa
 
     private String change;
 
-    private com.commercetools.history.models.common.StateType previousValue;
+    private com.commercetools.history.models.common.StateTypeEnum previousValue;
 
-    private com.commercetools.history.models.common.StateType nextValue;
+    private com.commercetools.history.models.common.StateTypeEnum nextValue;
 
     /**
      * create instance with all properties
      */
     @JsonCreator
     ChangeStateTypeChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final com.commercetools.history.models.common.StateType previousValue,
-            @JsonProperty("nextValue") final com.commercetools.history.models.common.StateType nextValue) {
+            @JsonProperty("previousValue") final com.commercetools.history.models.common.StateTypeEnum previousValue,
+            @JsonProperty("nextValue") final com.commercetools.history.models.common.StateTypeEnum nextValue) {
         this.change = change;
         this.previousValue = previousValue;
         this.nextValue = nextValue;
@@ -70,7 +70,7 @@ public String getChange() {
      *  <p>Value before the change.</p>
      */
 
-    public com.commercetools.history.models.common.StateType getPreviousValue() {
+    public com.commercetools.history.models.common.StateTypeEnum getPreviousValue() {
         return this.previousValue;
     }
 
@@ -78,7 +78,7 @@ public com.commercetools.history.models.common.StateType getPreviousValue() {
      *  <p>Value after the change.</p>
      */
 
-    public com.commercetools.history.models.common.StateType getNextValue() {
+    public com.commercetools.history.models.common.StateTypeEnum getNextValue() {
         return this.nextValue;
     }
 
@@ -86,11 +86,11 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.StateType previousValue) {
+    public void setPreviousValue(final com.commercetools.history.models.common.StateTypeEnum previousValue) {
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.StateType nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.StateTypeEnum nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChange.java
index 53005f40964..6b6160d4ddd 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChange.java
@@ -8,7 +8,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.common.ChannelRole;
+import com.commercetools.history.models.common.ChannelRoleEnum;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -60,7 +60,7 @@ public interface RemoveChannelRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("previousValue")
-    public List<ChannelRole> getPreviousValue();
+    public List<ChannelRoleEnum> getPreviousValue();
 
     /**
      *  <p>Value after the change.</p>
@@ -68,7 +68,7 @@ public interface RemoveChannelRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("nextValue")
-    public List<ChannelRole> getNextValue();
+    public List<ChannelRoleEnum> getNextValue();
 
     /**
      * set change
@@ -83,14 +83,14 @@ public interface RemoveChannelRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setPreviousValue(final ChannelRole... previousValue);
+    public void setPreviousValue(final ChannelRoleEnum... previousValue);
 
     /**
      *  <p>Value before the change.</p>
      * @param previousValue values to be set
      */
 
-    public void setPreviousValue(final List<ChannelRole> previousValue);
+    public void setPreviousValue(final List<ChannelRoleEnum> previousValue);
 
     /**
      *  <p>Value after the change.</p>
@@ -98,14 +98,14 @@ public interface RemoveChannelRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setNextValue(final ChannelRole... nextValue);
+    public void setNextValue(final ChannelRoleEnum... nextValue);
 
     /**
      *  <p>Value after the change.</p>
      * @param nextValue values to be set
      */
 
-    public void setNextValue(final List<ChannelRole> nextValue);
+    public void setNextValue(final List<ChannelRoleEnum> nextValue);
 
     /**
      * factory method
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeBuilder.java
index 10b13759b62..ba8207b7a5c 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeBuilder.java
@@ -25,9 +25,9 @@ public class RemoveChannelRolesChangeBuilder implements Builder<RemoveChannelRol
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue;
 
     /**
      * set the value to the change
@@ -47,7 +47,7 @@ public RemoveChannelRolesChangeBuilder change(final String change) {
      */
 
     public RemoveChannelRolesChangeBuilder previousValue(
-            final com.commercetools.history.models.common.ChannelRole... previousValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
         return this;
     }
@@ -59,7 +59,7 @@ public RemoveChannelRolesChangeBuilder previousValue(
      */
 
     public RemoveChannelRolesChangeBuilder previousValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue) {
         this.previousValue = previousValue;
         return this;
     }
@@ -71,7 +71,7 @@ public RemoveChannelRolesChangeBuilder previousValue(
      */
 
     public RemoveChannelRolesChangeBuilder plusPreviousValue(
-            final com.commercetools.history.models.common.ChannelRole... previousValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         if (this.previousValue == null) {
             this.previousValue = new ArrayList<>();
         }
@@ -86,7 +86,7 @@ public RemoveChannelRolesChangeBuilder plusPreviousValue(
      */
 
     public RemoveChannelRolesChangeBuilder nextValue(
-            final com.commercetools.history.models.common.ChannelRole... nextValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
         return this;
     }
@@ -98,7 +98,7 @@ public RemoveChannelRolesChangeBuilder nextValue(
      */
 
     public RemoveChannelRolesChangeBuilder nextValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -110,7 +110,7 @@ public RemoveChannelRolesChangeBuilder nextValue(
      */
 
     public RemoveChannelRolesChangeBuilder plusNextValue(
-            final com.commercetools.history.models.common.ChannelRole... nextValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         if (this.nextValue == null) {
             this.nextValue = new ArrayList<>();
         }
@@ -132,7 +132,7 @@ public String getChange() {
      * @return previousValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -141,7 +141,7 @@ public java.util.List<com.commercetools.history.models.common.ChannelRole> getPr
      * @return nextValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeImpl.java
index 8f9157738ad..4483c1bd0f3 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeImpl.java
@@ -26,17 +26,17 @@ public class RemoveChannelRolesChangeImpl implements RemoveChannelRolesChange, M
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue;
 
     /**
      * create instance with all properties
      */
     @JsonCreator
     RemoveChannelRolesChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue,
-            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue,
+            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.change = change;
         this.previousValue = previousValue;
         this.nextValue = nextValue;
@@ -70,7 +70,7 @@ public String getChange() {
      *  <p>Value before the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -78,7 +78,7 @@ public java.util.List<com.commercetools.history.models.common.ChannelRole> getPr
      *  <p>Value after the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
@@ -86,20 +86,20 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.ChannelRole... previousValue) {
+    public void setPreviousValue(final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
     }
 
     public void setPreviousValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue) {
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.ChannelRole... nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
     }
 
-    public void setNextValue(final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+    public void setNextValue(final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChange.java
index 99e80d363cb..691f0334d2f 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChange.java
@@ -25,7 +25,6 @@
  *     RemoveLocationChange removeLocationChange = RemoveLocationChange.builder()
  *             .change("{change}")
  *             .previousValue(previousValueBuilder -> previousValueBuilder)
- *             .nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
  * </div>
@@ -64,15 +63,6 @@ public interface RemoveLocationChange extends Change {
     @JsonProperty("previousValue")
     public Location getPreviousValue();
 
-    /**
-     *  <p>Value after the change.</p>
-     * @return nextValue
-     */
-    @NotNull
-    @Valid
-    @JsonProperty("nextValue")
-    public Location getNextValue();
-
     /**
      * set change
      * @param change value to be set
@@ -87,13 +77,6 @@ public interface RemoveLocationChange extends Change {
 
     public void setPreviousValue(final Location previousValue);
 
-    /**
-     *  <p>Value after the change.</p>
-     * @param nextValue value to be set
-     */
-
-    public void setNextValue(final Location nextValue);
-
     /**
      * factory method
      * @return instance of RemoveLocationChange
@@ -111,7 +94,6 @@ public static RemoveLocationChange of(final RemoveLocationChange template) {
         RemoveLocationChangeImpl instance = new RemoveLocationChangeImpl();
         instance.setChange(template.getChange());
         instance.setPreviousValue(template.getPreviousValue());
-        instance.setNextValue(template.getNextValue());
         return instance;
     }
 
@@ -129,7 +111,6 @@ public static RemoveLocationChange deepCopy(@Nullable final RemoveLocationChange
         instance.setChange(template.getChange());
         instance.setPreviousValue(
             com.commercetools.history.models.common.Location.deepCopy(template.getPreviousValue()));
-        instance.setNextValue(com.commercetools.history.models.common.Location.deepCopy(template.getNextValue()));
         return instance;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChangeBuilder.java
index 1ffeb9facc0..8063a391b0a 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChangeBuilder.java
@@ -16,7 +16,6 @@
  *     RemoveLocationChange removeLocationChange = RemoveLocationChange.builder()
  *             .change("{change}")
  *             .previousValue(previousValueBuilder -> previousValueBuilder)
- *             .nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
  * </div>
@@ -28,8 +27,6 @@ public class RemoveLocationChangeBuilder implements Builder<RemoveLocationChange
 
     private com.commercetools.history.models.common.Location previousValue;
 
-    private com.commercetools.history.models.common.Location nextValue;
-
     /**
      * set the value to the change
      * @param change value to be set
@@ -77,41 +74,6 @@ public RemoveLocationChangeBuilder previousValue(
         return this;
     }
 
-    /**
-     *  <p>Value after the change.</p>
-     * @param builder function to build the nextValue value
-     * @return Builder
-     */
-
-    public RemoveLocationChangeBuilder nextValue(
-            Function<com.commercetools.history.models.common.LocationBuilder, com.commercetools.history.models.common.LocationBuilder> builder) {
-        this.nextValue = builder.apply(com.commercetools.history.models.common.LocationBuilder.of()).build();
-        return this;
-    }
-
-    /**
-     *  <p>Value after the change.</p>
-     * @param builder function to build the nextValue value
-     * @return Builder
-     */
-
-    public RemoveLocationChangeBuilder withNextValue(
-            Function<com.commercetools.history.models.common.LocationBuilder, com.commercetools.history.models.common.Location> builder) {
-        this.nextValue = builder.apply(com.commercetools.history.models.common.LocationBuilder.of());
-        return this;
-    }
-
-    /**
-     *  <p>Value after the change.</p>
-     * @param nextValue value to be set
-     * @return Builder
-     */
-
-    public RemoveLocationChangeBuilder nextValue(final com.commercetools.history.models.common.Location nextValue) {
-        this.nextValue = nextValue;
-        return this;
-    }
-
     /**
      * value of change}
      * @return change
@@ -130,15 +92,6 @@ public com.commercetools.history.models.common.Location getPreviousValue() {
         return this.previousValue;
     }
 
-    /**
-     *  <p>Value after the change.</p>
-     * @return nextValue
-     */
-
-    public com.commercetools.history.models.common.Location getNextValue() {
-        return this.nextValue;
-    }
-
     /**
      * builds RemoveLocationChange with checking for non-null required values
      * @return RemoveLocationChange
@@ -146,8 +99,7 @@ public com.commercetools.history.models.common.Location getNextValue() {
     public RemoveLocationChange build() {
         Objects.requireNonNull(change, RemoveLocationChange.class + ": change is missing");
         Objects.requireNonNull(previousValue, RemoveLocationChange.class + ": previousValue is missing");
-        Objects.requireNonNull(nextValue, RemoveLocationChange.class + ": nextValue is missing");
-        return new RemoveLocationChangeImpl(change, previousValue, nextValue);
+        return new RemoveLocationChangeImpl(change, previousValue);
     }
 
     /**
@@ -155,7 +107,7 @@ public RemoveLocationChange build() {
      * @return RemoveLocationChange
      */
     public RemoveLocationChange buildUnchecked() {
-        return new RemoveLocationChangeImpl(change, previousValue, nextValue);
+        return new RemoveLocationChangeImpl(change, previousValue);
     }
 
     /**
@@ -175,7 +127,6 @@ public static RemoveLocationChangeBuilder of(final RemoveLocationChange template
         RemoveLocationChangeBuilder builder = new RemoveLocationChangeBuilder();
         builder.change = template.getChange();
         builder.previousValue = template.getPreviousValue();
-        builder.nextValue = template.getNextValue();
         return builder;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChangeImpl.java
index 11126cb352d..4befde48988 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveLocationChangeImpl.java
@@ -28,18 +28,14 @@ public class RemoveLocationChangeImpl implements RemoveLocationChange, ModelBase
 
     private com.commercetools.history.models.common.Location previousValue;
 
-    private com.commercetools.history.models.common.Location nextValue;
-
     /**
      * create instance with all properties
      */
     @JsonCreator
     RemoveLocationChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final com.commercetools.history.models.common.Location previousValue,
-            @JsonProperty("nextValue") final com.commercetools.history.models.common.Location nextValue) {
+            @JsonProperty("previousValue") final com.commercetools.history.models.common.Location previousValue) {
         this.change = change;
         this.previousValue = previousValue;
-        this.nextValue = nextValue;
         this.type = REMOVE_LOCATION_CHANGE;
     }
 
@@ -74,14 +70,6 @@ public com.commercetools.history.models.common.Location getPreviousValue() {
         return this.previousValue;
     }
 
-    /**
-     *  <p>Value after the change.</p>
-     */
-
-    public com.commercetools.history.models.common.Location getNextValue() {
-        return this.nextValue;
-    }
-
     public void setChange(final String change) {
         this.change = change;
     }
@@ -90,10 +78,6 @@ public void setPreviousValue(final com.commercetools.history.models.common.Locat
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.Location nextValue) {
-        this.nextValue = nextValue;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -107,21 +91,15 @@ public boolean equals(Object o) {
         return new EqualsBuilder().append(type, that.type)
                 .append(change, that.change)
                 .append(previousValue, that.previousValue)
-                .append(nextValue, that.nextValue)
                 .append(type, that.type)
                 .append(change, that.change)
                 .append(previousValue, that.previousValue)
-                .append(nextValue, that.nextValue)
                 .isEquals();
     }
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder(17, 37).append(type)
-                .append(change)
-                .append(previousValue)
-                .append(nextValue)
-                .toHashCode();
+        return new HashCodeBuilder(17, 37).append(type).append(change).append(previousValue).toHashCode();
     }
 
     @Override
@@ -129,7 +107,6 @@ public String toString() {
         return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("type", type)
                 .append("change", change)
                 .append("previousValue", previousValue)
-                .append("nextValue", nextValue)
                 .build();
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChange.java
index 3f8b9e9fbc0..ea19a4642ed 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChange.java
@@ -8,7 +8,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.common.StateRole;
+import com.commercetools.history.models.common.StateRoleEnum;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -60,7 +60,7 @@ public interface RemoveStateRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("previousValue")
-    public List<StateRole> getPreviousValue();
+    public List<StateRoleEnum> getPreviousValue();
 
     /**
      *  <p>Value after the change.</p>
@@ -68,7 +68,7 @@ public interface RemoveStateRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("nextValue")
-    public List<StateRole> getNextValue();
+    public List<StateRoleEnum> getNextValue();
 
     /**
      * set change
@@ -83,14 +83,14 @@ public interface RemoveStateRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setPreviousValue(final StateRole... previousValue);
+    public void setPreviousValue(final StateRoleEnum... previousValue);
 
     /**
      *  <p>Value before the change.</p>
      * @param previousValue values to be set
      */
 
-    public void setPreviousValue(final List<StateRole> previousValue);
+    public void setPreviousValue(final List<StateRoleEnum> previousValue);
 
     /**
      *  <p>Value after the change.</p>
@@ -98,14 +98,14 @@ public interface RemoveStateRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setNextValue(final StateRole... nextValue);
+    public void setNextValue(final StateRoleEnum... nextValue);
 
     /**
      *  <p>Value after the change.</p>
      * @param nextValue values to be set
      */
 
-    public void setNextValue(final List<StateRole> nextValue);
+    public void setNextValue(final List<StateRoleEnum> nextValue);
 
     /**
      * factory method
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeBuilder.java
index 5a6d4ecccc6..ad3616d2f33 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeBuilder.java
@@ -25,9 +25,9 @@ public class RemoveStateRolesChangeBuilder implements Builder<RemoveStateRolesCh
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue;
 
     /**
      * set the value to the change
@@ -47,7 +47,7 @@ public RemoveStateRolesChangeBuilder change(final String change) {
      */
 
     public RemoveStateRolesChangeBuilder previousValue(
-            final com.commercetools.history.models.common.StateRole... previousValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
         return this;
     }
@@ -59,7 +59,7 @@ public RemoveStateRolesChangeBuilder previousValue(
      */
 
     public RemoveStateRolesChangeBuilder previousValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue) {
         this.previousValue = previousValue;
         return this;
     }
@@ -71,7 +71,7 @@ public RemoveStateRolesChangeBuilder previousValue(
      */
 
     public RemoveStateRolesChangeBuilder plusPreviousValue(
-            final com.commercetools.history.models.common.StateRole... previousValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         if (this.previousValue == null) {
             this.previousValue = new ArrayList<>();
         }
@@ -86,7 +86,7 @@ public RemoveStateRolesChangeBuilder plusPreviousValue(
      */
 
     public RemoveStateRolesChangeBuilder nextValue(
-            final com.commercetools.history.models.common.StateRole... nextValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
         return this;
     }
@@ -98,7 +98,7 @@ public RemoveStateRolesChangeBuilder nextValue(
      */
 
     public RemoveStateRolesChangeBuilder nextValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -110,7 +110,7 @@ public RemoveStateRolesChangeBuilder nextValue(
      */
 
     public RemoveStateRolesChangeBuilder plusNextValue(
-            final com.commercetools.history.models.common.StateRole... nextValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         if (this.nextValue == null) {
             this.nextValue = new ArrayList<>();
         }
@@ -132,7 +132,7 @@ public String getChange() {
      * @return previousValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -141,7 +141,7 @@ public java.util.List<com.commercetools.history.models.common.StateRole> getPrev
      * @return nextValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeImpl.java
index d74e61fa8ad..9e7a5b2e070 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeImpl.java
@@ -26,17 +26,17 @@ public class RemoveStateRolesChangeImpl implements RemoveStateRolesChange, Model
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue;
 
     /**
      * create instance with all properties
      */
     @JsonCreator
     RemoveStateRolesChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.StateRole> previousValue,
-            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue,
+            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.change = change;
         this.previousValue = previousValue;
         this.nextValue = nextValue;
@@ -70,7 +70,7 @@ public String getChange() {
      *  <p>Value before the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -78,7 +78,7 @@ public java.util.List<com.commercetools.history.models.common.StateRole> getPrev
      *  <p>Value after the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
@@ -86,20 +86,20 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.StateRole... previousValue) {
+    public void setPreviousValue(final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
     }
 
     public void setPreviousValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue) {
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.StateRole... nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
     }
 
-    public void setNextValue(final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+    public void setNextValue(final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChange.java
index fe0bee4150a..19f2b5cd221 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChange.java
@@ -25,7 +25,6 @@
  *     RemoveTaxRateChange removeTaxRateChange = RemoveTaxRateChange.builder()
  *             .change("{change}")
  *             .previousValue(previousValueBuilder -> previousValueBuilder)
- *             .nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
  * </div>
@@ -64,15 +63,6 @@ public interface RemoveTaxRateChange extends Change {
     @JsonProperty("previousValue")
     public TaxRate getPreviousValue();
 
-    /**
-     *  <p>Value after the change.</p>
-     * @return nextValue
-     */
-    @NotNull
-    @Valid
-    @JsonProperty("nextValue")
-    public TaxRate getNextValue();
-
     /**
      * set change
      * @param change value to be set
@@ -87,13 +77,6 @@ public interface RemoveTaxRateChange extends Change {
 
     public void setPreviousValue(final TaxRate previousValue);
 
-    /**
-     *  <p>Value after the change.</p>
-     * @param nextValue value to be set
-     */
-
-    public void setNextValue(final TaxRate nextValue);
-
     /**
      * factory method
      * @return instance of RemoveTaxRateChange
@@ -111,7 +94,6 @@ public static RemoveTaxRateChange of(final RemoveTaxRateChange template) {
         RemoveTaxRateChangeImpl instance = new RemoveTaxRateChangeImpl();
         instance.setChange(template.getChange());
         instance.setPreviousValue(template.getPreviousValue());
-        instance.setNextValue(template.getNextValue());
         return instance;
     }
 
@@ -129,7 +111,6 @@ public static RemoveTaxRateChange deepCopy(@Nullable final RemoveTaxRateChange t
         instance.setChange(template.getChange());
         instance.setPreviousValue(
             com.commercetools.history.models.common.TaxRate.deepCopy(template.getPreviousValue()));
-        instance.setNextValue(com.commercetools.history.models.common.TaxRate.deepCopy(template.getNextValue()));
         return instance;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeBuilder.java
index c34ef62c995..12d09eb4781 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeBuilder.java
@@ -16,7 +16,6 @@
  *     RemoveTaxRateChange removeTaxRateChange = RemoveTaxRateChange.builder()
  *             .change("{change}")
  *             .previousValue(previousValueBuilder -> previousValueBuilder)
- *             .nextValue(nextValueBuilder -> nextValueBuilder)
  *             .build()
  * </code></pre>
  * </div>
@@ -28,8 +27,6 @@ public class RemoveTaxRateChangeBuilder implements Builder<RemoveTaxRateChange>
 
     private com.commercetools.history.models.common.TaxRate previousValue;
 
-    private com.commercetools.history.models.common.TaxRate nextValue;
-
     /**
      * set the value to the change
      * @param change value to be set
@@ -77,41 +74,6 @@ public RemoveTaxRateChangeBuilder previousValue(
         return this;
     }
 
-    /**
-     *  <p>Value after the change.</p>
-     * @param builder function to build the nextValue value
-     * @return Builder
-     */
-
-    public RemoveTaxRateChangeBuilder nextValue(
-            Function<com.commercetools.history.models.common.TaxRateBuilder, com.commercetools.history.models.common.TaxRateBuilder> builder) {
-        this.nextValue = builder.apply(com.commercetools.history.models.common.TaxRateBuilder.of()).build();
-        return this;
-    }
-
-    /**
-     *  <p>Value after the change.</p>
-     * @param builder function to build the nextValue value
-     * @return Builder
-     */
-
-    public RemoveTaxRateChangeBuilder withNextValue(
-            Function<com.commercetools.history.models.common.TaxRateBuilder, com.commercetools.history.models.common.TaxRate> builder) {
-        this.nextValue = builder.apply(com.commercetools.history.models.common.TaxRateBuilder.of());
-        return this;
-    }
-
-    /**
-     *  <p>Value after the change.</p>
-     * @param nextValue value to be set
-     * @return Builder
-     */
-
-    public RemoveTaxRateChangeBuilder nextValue(final com.commercetools.history.models.common.TaxRate nextValue) {
-        this.nextValue = nextValue;
-        return this;
-    }
-
     /**
      * value of change}
      * @return change
@@ -130,15 +92,6 @@ public com.commercetools.history.models.common.TaxRate getPreviousValue() {
         return this.previousValue;
     }
 
-    /**
-     *  <p>Value after the change.</p>
-     * @return nextValue
-     */
-
-    public com.commercetools.history.models.common.TaxRate getNextValue() {
-        return this.nextValue;
-    }
-
     /**
      * builds RemoveTaxRateChange with checking for non-null required values
      * @return RemoveTaxRateChange
@@ -146,8 +99,7 @@ public com.commercetools.history.models.common.TaxRate getNextValue() {
     public RemoveTaxRateChange build() {
         Objects.requireNonNull(change, RemoveTaxRateChange.class + ": change is missing");
         Objects.requireNonNull(previousValue, RemoveTaxRateChange.class + ": previousValue is missing");
-        Objects.requireNonNull(nextValue, RemoveTaxRateChange.class + ": nextValue is missing");
-        return new RemoveTaxRateChangeImpl(change, previousValue, nextValue);
+        return new RemoveTaxRateChangeImpl(change, previousValue);
     }
 
     /**
@@ -155,7 +107,7 @@ public RemoveTaxRateChange build() {
      * @return RemoveTaxRateChange
      */
     public RemoveTaxRateChange buildUnchecked() {
-        return new RemoveTaxRateChangeImpl(change, previousValue, nextValue);
+        return new RemoveTaxRateChangeImpl(change, previousValue);
     }
 
     /**
@@ -175,7 +127,6 @@ public static RemoveTaxRateChangeBuilder of(final RemoveTaxRateChange template)
         RemoveTaxRateChangeBuilder builder = new RemoveTaxRateChangeBuilder();
         builder.change = template.getChange();
         builder.previousValue = template.getPreviousValue();
-        builder.nextValue = template.getNextValue();
         return builder;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeImpl.java
index 41873ae49fa..3f41264b24b 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeImpl.java
@@ -28,18 +28,14 @@ public class RemoveTaxRateChangeImpl implements RemoveTaxRateChange, ModelBase {
 
     private com.commercetools.history.models.common.TaxRate previousValue;
 
-    private com.commercetools.history.models.common.TaxRate nextValue;
-
     /**
      * create instance with all properties
      */
     @JsonCreator
     RemoveTaxRateChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final com.commercetools.history.models.common.TaxRate previousValue,
-            @JsonProperty("nextValue") final com.commercetools.history.models.common.TaxRate nextValue) {
+            @JsonProperty("previousValue") final com.commercetools.history.models.common.TaxRate previousValue) {
         this.change = change;
         this.previousValue = previousValue;
-        this.nextValue = nextValue;
         this.type = REMOVE_TAX_RATE_CHANGE;
     }
 
@@ -74,14 +70,6 @@ public com.commercetools.history.models.common.TaxRate getPreviousValue() {
         return this.previousValue;
     }
 
-    /**
-     *  <p>Value after the change.</p>
-     */
-
-    public com.commercetools.history.models.common.TaxRate getNextValue() {
-        return this.nextValue;
-    }
-
     public void setChange(final String change) {
         this.change = change;
     }
@@ -90,10 +78,6 @@ public void setPreviousValue(final com.commercetools.history.models.common.TaxRa
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.TaxRate nextValue) {
-        this.nextValue = nextValue;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -107,21 +91,15 @@ public boolean equals(Object o) {
         return new EqualsBuilder().append(type, that.type)
                 .append(change, that.change)
                 .append(previousValue, that.previousValue)
-                .append(nextValue, that.nextValue)
                 .append(type, that.type)
                 .append(change, that.change)
                 .append(previousValue, that.previousValue)
-                .append(nextValue, that.nextValue)
                 .isEquals();
     }
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder(17, 37).append(type)
-                .append(change)
-                .append(previousValue)
-                .append(nextValue)
-                .toHashCode();
+        return new HashCodeBuilder(17, 37).append(type).append(change).append(previousValue).toHashCode();
     }
 
     @Override
@@ -129,7 +107,6 @@ public String toString() {
         return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("type", type)
                 .append("change", change)
                 .append("previousValue", previousValue)
-                .append("nextValue", nextValue)
                 .build();
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChange.java
index 88e65c08c5f..381ba0a49be 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChange.java
@@ -8,7 +8,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.common.ChannelRole;
+import com.commercetools.history.models.common.ChannelRoleEnum;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -60,7 +60,7 @@ public interface SetChannelRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("previousValue")
-    public List<ChannelRole> getPreviousValue();
+    public List<ChannelRoleEnum> getPreviousValue();
 
     /**
      *  <p>Value after the change.</p>
@@ -68,7 +68,7 @@ public interface SetChannelRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("nextValue")
-    public List<ChannelRole> getNextValue();
+    public List<ChannelRoleEnum> getNextValue();
 
     /**
      * set change
@@ -83,14 +83,14 @@ public interface SetChannelRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setPreviousValue(final ChannelRole... previousValue);
+    public void setPreviousValue(final ChannelRoleEnum... previousValue);
 
     /**
      *  <p>Value before the change.</p>
      * @param previousValue values to be set
      */
 
-    public void setPreviousValue(final List<ChannelRole> previousValue);
+    public void setPreviousValue(final List<ChannelRoleEnum> previousValue);
 
     /**
      *  <p>Value after the change.</p>
@@ -98,14 +98,14 @@ public interface SetChannelRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setNextValue(final ChannelRole... nextValue);
+    public void setNextValue(final ChannelRoleEnum... nextValue);
 
     /**
      *  <p>Value after the change.</p>
      * @param nextValue values to be set
      */
 
-    public void setNextValue(final List<ChannelRole> nextValue);
+    public void setNextValue(final List<ChannelRoleEnum> nextValue);
 
     /**
      * factory method
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeBuilder.java
index 65e9bb03b9e..9f26f6605a9 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeBuilder.java
@@ -25,9 +25,9 @@ public class SetChannelRolesChangeBuilder implements Builder<SetChannelRolesChan
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue;
 
     /**
      * set the value to the change
@@ -47,7 +47,7 @@ public SetChannelRolesChangeBuilder change(final String change) {
      */
 
     public SetChannelRolesChangeBuilder previousValue(
-            final com.commercetools.history.models.common.ChannelRole... previousValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
         return this;
     }
@@ -59,7 +59,7 @@ public SetChannelRolesChangeBuilder previousValue(
      */
 
     public SetChannelRolesChangeBuilder previousValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue) {
         this.previousValue = previousValue;
         return this;
     }
@@ -71,7 +71,7 @@ public SetChannelRolesChangeBuilder previousValue(
      */
 
     public SetChannelRolesChangeBuilder plusPreviousValue(
-            final com.commercetools.history.models.common.ChannelRole... previousValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         if (this.previousValue == null) {
             this.previousValue = new ArrayList<>();
         }
@@ -86,7 +86,7 @@ public SetChannelRolesChangeBuilder plusPreviousValue(
      */
 
     public SetChannelRolesChangeBuilder nextValue(
-            final com.commercetools.history.models.common.ChannelRole... nextValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
         return this;
     }
@@ -98,7 +98,7 @@ public SetChannelRolesChangeBuilder nextValue(
      */
 
     public SetChannelRolesChangeBuilder nextValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -110,7 +110,7 @@ public SetChannelRolesChangeBuilder nextValue(
      */
 
     public SetChannelRolesChangeBuilder plusNextValue(
-            final com.commercetools.history.models.common.ChannelRole... nextValue) {
+            final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         if (this.nextValue == null) {
             this.nextValue = new ArrayList<>();
         }
@@ -132,7 +132,7 @@ public String getChange() {
      * @return previousValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -141,7 +141,7 @@ public java.util.List<com.commercetools.history.models.common.ChannelRole> getPr
      * @return nextValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeImpl.java
index b132e8aadd3..658fc806f8b 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeImpl.java
@@ -26,17 +26,17 @@ public class SetChannelRolesChangeImpl implements SetChannelRolesChange, ModelBa
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue;
 
     /**
      * create instance with all properties
      */
     @JsonCreator
     SetChannelRolesChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue,
-            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue,
+            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.change = change;
         this.previousValue = previousValue;
         this.nextValue = nextValue;
@@ -70,7 +70,7 @@ public String getChange() {
      *  <p>Value before the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -78,7 +78,7 @@ public java.util.List<com.commercetools.history.models.common.ChannelRole> getPr
      *  <p>Value after the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.ChannelRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
@@ -86,20 +86,20 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.ChannelRole... previousValue) {
+    public void setPreviousValue(final com.commercetools.history.models.common.ChannelRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
     }
 
     public void setPreviousValue(
-            final java.util.List<com.commercetools.history.models.common.ChannelRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> previousValue) {
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.ChannelRole... nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.ChannelRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
     }
 
-    public void setNextValue(final java.util.List<com.commercetools.history.models.common.ChannelRole> nextValue) {
+    public void setNextValue(final java.util.List<com.commercetools.history.models.common.ChannelRoleEnum> nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetDescriptionChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetDescriptionChange.java
index 28d034b4315..3bff2eb2c95 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetDescriptionChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetDescriptionChange.java
@@ -16,15 +16,7 @@
 /**
  *  <p>Change triggered by the following update actions:</p>
  *  <ul>
- *   <li>Set Description on Cart Discounts.</li>
- *   <li>Set Description on Categories.</li>
- *   <li>Set Description on Discount Codes.</li>
- *   <li>Set Description on Products.</li>
- *   <li>Set Description on Product Discounts.</li>
- *   <li>Set Description on Shopping Lists.</li>
- *   <li>Set Description on States.</li>
  *   <li>Set Description on Tax Categories.</li>
- *   <li>Set Description on Types.</li>
  *   <li>Set Description on Zones.</li>
  *  </ul>
  *
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetDescriptionChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetDescriptionChangeImpl.java
index 71f9fcbe868..4ad78557818 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetDescriptionChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetDescriptionChangeImpl.java
@@ -19,15 +19,7 @@
 /**
  *  <p>Change triggered by the following update actions:</p>
  *  <ul>
- *   <li>Set Description on Cart Discounts.</li>
- *   <li>Set Description on Categories.</li>
- *   <li>Set Description on Discount Codes.</li>
- *   <li>Set Description on Products.</li>
- *   <li>Set Description on Product Discounts.</li>
- *   <li>Set Description on Shopping Lists.</li>
- *   <li>Set Description on States.</li>
  *   <li>Set Description on Tax Categories.</li>
- *   <li>Set Description on Types.</li>
  *   <li>Set Description on Zones.</li>
  *  </ul>
  */
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChange.java
index e3b20830e38..ecf676be582 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChange.java
@@ -25,9 +25,7 @@
  *   <li>Set Description on Product Discounts.</li>
  *   <li>Set Description on Shopping Lists.</li>
  *   <li>Set Description on States.</li>
- *   <li>Set Description on Tax Categories.</li>
  *   <li>Set Description on Types.</li>
- *   <li>Set Description on Zones.</li>
  *  </ul>
  *
  * <hr>
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChangeImpl.java
index 54af0646913..12e490af18f 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetLocalizedDescriptionChangeImpl.java
@@ -26,9 +26,7 @@
  *   <li>Set Description on Product Discounts.</li>
  *   <li>Set Description on Shopping Lists.</li>
  *   <li>Set Description on States.</li>
- *   <li>Set Description on Tax Categories.</li>
  *   <li>Set Description on Types.</li>
- *   <li>Set Description on Zones.</li>
  *  </ul>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChange.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChange.java
index a8d11d7bef9..526968b2533 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChange.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChange.java
@@ -8,7 +8,7 @@
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
 
-import com.commercetools.history.models.common.StateRole;
+import com.commercetools.history.models.common.StateRoleEnum;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.annotation.*;
 
@@ -60,7 +60,7 @@ public interface SetStateRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("previousValue")
-    public List<StateRole> getPreviousValue();
+    public List<StateRoleEnum> getPreviousValue();
 
     /**
      *  <p>Value after the change.</p>
@@ -68,7 +68,7 @@ public interface SetStateRolesChange extends Change {
      */
     @NotNull
     @JsonProperty("nextValue")
-    public List<StateRole> getNextValue();
+    public List<StateRoleEnum> getNextValue();
 
     /**
      * set change
@@ -83,14 +83,14 @@ public interface SetStateRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setPreviousValue(final StateRole... previousValue);
+    public void setPreviousValue(final StateRoleEnum... previousValue);
 
     /**
      *  <p>Value before the change.</p>
      * @param previousValue values to be set
      */
 
-    public void setPreviousValue(final List<StateRole> previousValue);
+    public void setPreviousValue(final List<StateRoleEnum> previousValue);
 
     /**
      *  <p>Value after the change.</p>
@@ -98,14 +98,14 @@ public interface SetStateRolesChange extends Change {
      */
 
     @JsonIgnore
-    public void setNextValue(final StateRole... nextValue);
+    public void setNextValue(final StateRoleEnum... nextValue);
 
     /**
      *  <p>Value after the change.</p>
      * @param nextValue values to be set
      */
 
-    public void setNextValue(final List<StateRole> nextValue);
+    public void setNextValue(final List<StateRoleEnum> nextValue);
 
     /**
      * factory method
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChangeBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChangeBuilder.java
index 8036d05ed2c..9f31fd2d558 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChangeBuilder.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChangeBuilder.java
@@ -25,9 +25,9 @@ public class SetStateRolesChangeBuilder implements Builder<SetStateRolesChange>
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue;
 
     /**
      * set the value to the change
@@ -47,7 +47,7 @@ public SetStateRolesChangeBuilder change(final String change) {
      */
 
     public SetStateRolesChangeBuilder previousValue(
-            final com.commercetools.history.models.common.StateRole... previousValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
         return this;
     }
@@ -59,7 +59,7 @@ public SetStateRolesChangeBuilder previousValue(
      */
 
     public SetStateRolesChangeBuilder previousValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue) {
         this.previousValue = previousValue;
         return this;
     }
@@ -71,7 +71,7 @@ public SetStateRolesChangeBuilder previousValue(
      */
 
     public SetStateRolesChangeBuilder plusPreviousValue(
-            final com.commercetools.history.models.common.StateRole... previousValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         if (this.previousValue == null) {
             this.previousValue = new ArrayList<>();
         }
@@ -85,7 +85,8 @@ public SetStateRolesChangeBuilder plusPreviousValue(
      * @return Builder
      */
 
-    public SetStateRolesChangeBuilder nextValue(final com.commercetools.history.models.common.StateRole... nextValue) {
+    public SetStateRolesChangeBuilder nextValue(
+            final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
         return this;
     }
@@ -97,7 +98,7 @@ public SetStateRolesChangeBuilder nextValue(final com.commercetools.history.mode
      */
 
     public SetStateRolesChangeBuilder nextValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.nextValue = nextValue;
         return this;
     }
@@ -109,7 +110,7 @@ public SetStateRolesChangeBuilder nextValue(
      */
 
     public SetStateRolesChangeBuilder plusNextValue(
-            final com.commercetools.history.models.common.StateRole... nextValue) {
+            final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         if (this.nextValue == null) {
             this.nextValue = new ArrayList<>();
         }
@@ -131,7 +132,7 @@ public String getChange() {
      * @return previousValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -140,7 +141,7 @@ public java.util.List<com.commercetools.history.models.common.StateRole> getPrev
      * @return nextValue
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChangeImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChangeImpl.java
index 0ff78fbc99f..8afd6861318 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChangeImpl.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/change/SetStateRolesChangeImpl.java
@@ -26,17 +26,17 @@ public class SetStateRolesChangeImpl implements SetStateRolesChange, ModelBase {
 
     private String change;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> previousValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue;
 
-    private java.util.List<com.commercetools.history.models.common.StateRole> nextValue;
+    private java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue;
 
     /**
      * create instance with all properties
      */
     @JsonCreator
     SetStateRolesChangeImpl(@JsonProperty("change") final String change,
-            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.StateRole> previousValue,
-            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+            @JsonProperty("previousValue") final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue,
+            @JsonProperty("nextValue") final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.change = change;
         this.previousValue = previousValue;
         this.nextValue = nextValue;
@@ -70,7 +70,7 @@ public String getChange() {
      *  <p>Value before the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getPreviousValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getPreviousValue() {
         return this.previousValue;
     }
 
@@ -78,7 +78,7 @@ public java.util.List<com.commercetools.history.models.common.StateRole> getPrev
      *  <p>Value after the change.</p>
      */
 
-    public java.util.List<com.commercetools.history.models.common.StateRole> getNextValue() {
+    public java.util.List<com.commercetools.history.models.common.StateRoleEnum> getNextValue() {
         return this.nextValue;
     }
 
@@ -86,20 +86,20 @@ public void setChange(final String change) {
         this.change = change;
     }
 
-    public void setPreviousValue(final com.commercetools.history.models.common.StateRole... previousValue) {
+    public void setPreviousValue(final com.commercetools.history.models.common.StateRoleEnum... previousValue) {
         this.previousValue = new ArrayList<>(Arrays.asList(previousValue));
     }
 
     public void setPreviousValue(
-            final java.util.List<com.commercetools.history.models.common.StateRole> previousValue) {
+            final java.util.List<com.commercetools.history.models.common.StateRoleEnum> previousValue) {
         this.previousValue = previousValue;
     }
 
-    public void setNextValue(final com.commercetools.history.models.common.StateRole... nextValue) {
+    public void setNextValue(final com.commercetools.history.models.common.StateRoleEnum... nextValue) {
         this.nextValue = new ArrayList<>(Arrays.asList(nextValue));
     }
 
-    public void setNextValue(final java.util.List<com.commercetools.history.models.common.StateRole> nextValue) {
+    public void setNextValue(final java.util.List<com.commercetools.history.models.common.StateRoleEnum> nextValue) {
         this.nextValue = nextValue;
     }
 
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValue.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValue.java
new file mode 100644
index 00000000000..f0d5cb5bc5d
--- /dev/null
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValue.java
@@ -0,0 +1,141 @@
+
+package com.commercetools.history.models.common;
+
+import java.time.*;
+import java.util.*;
+import java.util.function.Function;
+
+import javax.annotation.Nullable;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.*;
+
+import io.vrap.rmf.base.client.utils.Generated;
+
+/**
+ *  <p>A localized enum value must be unique within the enum, else a DuplicateEnumValues error is returned.</p>
+ *
+ * <hr>
+ * Example to create an instance using the builder pattern
+ * <div class=code-example>
+ * <pre><code class='java'>
+ *     AttributeLocalizedEnumValue attributeLocalizedEnumValue = AttributeLocalizedEnumValue.builder()
+ *             .key("{key}")
+ *             .label(labelBuilder -> labelBuilder)
+ *             .build()
+ * </code></pre>
+ * </div>
+ */
+@Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
+@JsonDeserialize(as = AttributeLocalizedEnumValueImpl.class)
+public interface AttributeLocalizedEnumValue {
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     * @return key
+     */
+    @NotNull
+    @JsonProperty("key")
+    public String getKey();
+
+    /**
+     *  <p>Descriptive, localized label of the value.</p>
+     * @return label
+     */
+    @NotNull
+    @Valid
+    @JsonProperty("label")
+    public LocalizedString getLabel();
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     * @param key value to be set
+     */
+
+    public void setKey(final String key);
+
+    /**
+     *  <p>Descriptive, localized label of the value.</p>
+     * @param label value to be set
+     */
+
+    public void setLabel(final LocalizedString label);
+
+    /**
+     * factory method
+     * @return instance of AttributeLocalizedEnumValue
+     */
+    public static AttributeLocalizedEnumValue of() {
+        return new AttributeLocalizedEnumValueImpl();
+    }
+
+    /**
+     * factory method to create a shallow copy AttributeLocalizedEnumValue
+     * @param template instance to be copied
+     * @return copy instance
+     */
+    public static AttributeLocalizedEnumValue of(final AttributeLocalizedEnumValue template) {
+        AttributeLocalizedEnumValueImpl instance = new AttributeLocalizedEnumValueImpl();
+        instance.setKey(template.getKey());
+        instance.setLabel(template.getLabel());
+        return instance;
+    }
+
+    /**
+     * factory method to create a deep copy of AttributeLocalizedEnumValue
+     * @param template instance to be copied
+     * @return copy instance
+     */
+    @Nullable
+    public static AttributeLocalizedEnumValue deepCopy(@Nullable final AttributeLocalizedEnumValue template) {
+        if (template == null) {
+            return null;
+        }
+        AttributeLocalizedEnumValueImpl instance = new AttributeLocalizedEnumValueImpl();
+        instance.setKey(template.getKey());
+        instance.setLabel(com.commercetools.history.models.common.LocalizedString.deepCopy(template.getLabel()));
+        return instance;
+    }
+
+    /**
+     * builder factory method for AttributeLocalizedEnumValue
+     * @return builder
+     */
+    public static AttributeLocalizedEnumValueBuilder builder() {
+        return AttributeLocalizedEnumValueBuilder.of();
+    }
+
+    /**
+     * create builder for AttributeLocalizedEnumValue instance
+     * @param template instance with prefilled values for the builder
+     * @return builder
+     */
+    public static AttributeLocalizedEnumValueBuilder builder(final AttributeLocalizedEnumValue template) {
+        return AttributeLocalizedEnumValueBuilder.of(template);
+    }
+
+    /**
+     * accessor map function
+     * @param <T> mapped type
+     * @param helper function to map the object
+     * @return mapped value
+     */
+    default <T> T withAttributeLocalizedEnumValue(Function<AttributeLocalizedEnumValue, T> helper) {
+        return helper.apply(this);
+    }
+
+    /**
+     * gives a TypeReference for usage with Jackson DataBind
+     * @return TypeReference
+     */
+    public static com.fasterxml.jackson.core.type.TypeReference<AttributeLocalizedEnumValue> typeReference() {
+        return new com.fasterxml.jackson.core.type.TypeReference<AttributeLocalizedEnumValue>() {
+            @Override
+            public String toString() {
+                return "TypeReference<AttributeLocalizedEnumValue>";
+            }
+        };
+    }
+}
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueBuilder.java
new file mode 100644
index 00000000000..a9ace53f812
--- /dev/null
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueBuilder.java
@@ -0,0 +1,133 @@
+
+package com.commercetools.history.models.common;
+
+import java.util.*;
+import java.util.function.Function;
+
+import io.vrap.rmf.base.client.Builder;
+import io.vrap.rmf.base.client.utils.Generated;
+
+/**
+ * AttributeLocalizedEnumValueBuilder
+ * <hr>
+ * Example to create an instance using the builder pattern
+ * <div class=code-example>
+ * <pre><code class='java'>
+ *     AttributeLocalizedEnumValue attributeLocalizedEnumValue = AttributeLocalizedEnumValue.builder()
+ *             .key("{key}")
+ *             .label(labelBuilder -> labelBuilder)
+ *             .build()
+ * </code></pre>
+ * </div>
+ */
+@Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
+public class AttributeLocalizedEnumValueBuilder implements Builder<AttributeLocalizedEnumValue> {
+
+    private String key;
+
+    private com.commercetools.history.models.common.LocalizedString label;
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     * @param key value to be set
+     * @return Builder
+     */
+
+    public AttributeLocalizedEnumValueBuilder key(final String key) {
+        this.key = key;
+        return this;
+    }
+
+    /**
+     *  <p>Descriptive, localized label of the value.</p>
+     * @param builder function to build the label value
+     * @return Builder
+     */
+
+    public AttributeLocalizedEnumValueBuilder label(
+            Function<com.commercetools.history.models.common.LocalizedStringBuilder, com.commercetools.history.models.common.LocalizedStringBuilder> builder) {
+        this.label = builder.apply(com.commercetools.history.models.common.LocalizedStringBuilder.of()).build();
+        return this;
+    }
+
+    /**
+     *  <p>Descriptive, localized label of the value.</p>
+     * @param builder function to build the label value
+     * @return Builder
+     */
+
+    public AttributeLocalizedEnumValueBuilder withLabel(
+            Function<com.commercetools.history.models.common.LocalizedStringBuilder, com.commercetools.history.models.common.LocalizedString> builder) {
+        this.label = builder.apply(com.commercetools.history.models.common.LocalizedStringBuilder.of());
+        return this;
+    }
+
+    /**
+     *  <p>Descriptive, localized label of the value.</p>
+     * @param label value to be set
+     * @return Builder
+     */
+
+    public AttributeLocalizedEnumValueBuilder label(
+            final com.commercetools.history.models.common.LocalizedString label) {
+        this.label = label;
+        return this;
+    }
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     * @return key
+     */
+
+    public String getKey() {
+        return this.key;
+    }
+
+    /**
+     *  <p>Descriptive, localized label of the value.</p>
+     * @return label
+     */
+
+    public com.commercetools.history.models.common.LocalizedString getLabel() {
+        return this.label;
+    }
+
+    /**
+     * builds AttributeLocalizedEnumValue with checking for non-null required values
+     * @return AttributeLocalizedEnumValue
+     */
+    public AttributeLocalizedEnumValue build() {
+        Objects.requireNonNull(key, AttributeLocalizedEnumValue.class + ": key is missing");
+        Objects.requireNonNull(label, AttributeLocalizedEnumValue.class + ": label is missing");
+        return new AttributeLocalizedEnumValueImpl(key, label);
+    }
+
+    /**
+     * builds AttributeLocalizedEnumValue without checking for non-null required values
+     * @return AttributeLocalizedEnumValue
+     */
+    public AttributeLocalizedEnumValue buildUnchecked() {
+        return new AttributeLocalizedEnumValueImpl(key, label);
+    }
+
+    /**
+     * factory method for an instance of AttributeLocalizedEnumValueBuilder
+     * @return builder
+     */
+    public static AttributeLocalizedEnumValueBuilder of() {
+        return new AttributeLocalizedEnumValueBuilder();
+    }
+
+    /**
+     * create builder for AttributeLocalizedEnumValue instance
+     * @param template instance with prefilled values for the builder
+     * @return builder
+     */
+    public static AttributeLocalizedEnumValueBuilder of(final AttributeLocalizedEnumValue template) {
+        AttributeLocalizedEnumValueBuilder builder = new AttributeLocalizedEnumValueBuilder();
+        builder.key = template.getKey();
+        builder.label = template.getLabel();
+        return builder;
+    }
+
+}
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueImpl.java
new file mode 100644
index 00000000000..a1ac9489014
--- /dev/null
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueImpl.java
@@ -0,0 +1,98 @@
+
+package com.commercetools.history.models.common;
+
+import java.time.*;
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.*;
+
+import io.vrap.rmf.base.client.ModelBase;
+import io.vrap.rmf.base.client.utils.Generated;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ *  <p>A localized enum value must be unique within the enum, else a DuplicateEnumValues error is returned.</p>
+ */
+@Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
+public class AttributeLocalizedEnumValueImpl implements AttributeLocalizedEnumValue, ModelBase {
+
+    private String key;
+
+    private com.commercetools.history.models.common.LocalizedString label;
+
+    /**
+     * create instance with all properties
+     */
+    @JsonCreator
+    AttributeLocalizedEnumValueImpl(@JsonProperty("key") final String key,
+            @JsonProperty("label") final com.commercetools.history.models.common.LocalizedString label) {
+        this.key = key;
+        this.label = label;
+    }
+
+    /**
+     * create empty instance
+     */
+    public AttributeLocalizedEnumValueImpl() {
+    }
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     */
+
+    public String getKey() {
+        return this.key;
+    }
+
+    /**
+     *  <p>Descriptive, localized label of the value.</p>
+     */
+
+    public com.commercetools.history.models.common.LocalizedString getLabel() {
+        return this.label;
+    }
+
+    public void setKey(final String key) {
+        this.key = key;
+    }
+
+    public void setLabel(final com.commercetools.history.models.common.LocalizedString label) {
+        this.label = label;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (o == null || getClass() != o.getClass())
+            return false;
+
+        AttributeLocalizedEnumValueImpl that = (AttributeLocalizedEnumValueImpl) o;
+
+        return new EqualsBuilder().append(key, that.key)
+                .append(label, that.label)
+                .append(key, that.key)
+                .append(label, that.label)
+                .isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37).append(key).append(label).toHashCode();
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("key", key)
+                .append("label", label)
+                .build();
+    }
+
+}
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValue.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValue.java
new file mode 100644
index 00000000000..8142cb9bb6f
--- /dev/null
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValue.java
@@ -0,0 +1,139 @@
+
+package com.commercetools.history.models.common;
+
+import java.time.*;
+import java.util.*;
+import java.util.function.Function;
+
+import javax.annotation.Nullable;
+import javax.validation.constraints.NotNull;
+
+import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.databind.annotation.*;
+
+import io.vrap.rmf.base.client.utils.Generated;
+
+/**
+ *  <p>A plain enum value must be unique within the enum, else a DuplicateEnumValues error is returned.</p>
+ *
+ * <hr>
+ * Example to create an instance using the builder pattern
+ * <div class=code-example>
+ * <pre><code class='java'>
+ *     AttributePlainEnumValue attributePlainEnumValue = AttributePlainEnumValue.builder()
+ *             .key("{key}")
+ *             .label("{label}")
+ *             .build()
+ * </code></pre>
+ * </div>
+ */
+@Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
+@JsonDeserialize(as = AttributePlainEnumValueImpl.class)
+public interface AttributePlainEnumValue {
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     * @return key
+     */
+    @NotNull
+    @JsonProperty("key")
+    public String getKey();
+
+    /**
+     *  <p>Descriptive label of the value.</p>
+     * @return label
+     */
+    @NotNull
+    @JsonProperty("label")
+    public String getLabel();
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     * @param key value to be set
+     */
+
+    public void setKey(final String key);
+
+    /**
+     *  <p>Descriptive label of the value.</p>
+     * @param label value to be set
+     */
+
+    public void setLabel(final String label);
+
+    /**
+     * factory method
+     * @return instance of AttributePlainEnumValue
+     */
+    public static AttributePlainEnumValue of() {
+        return new AttributePlainEnumValueImpl();
+    }
+
+    /**
+     * factory method to create a shallow copy AttributePlainEnumValue
+     * @param template instance to be copied
+     * @return copy instance
+     */
+    public static AttributePlainEnumValue of(final AttributePlainEnumValue template) {
+        AttributePlainEnumValueImpl instance = new AttributePlainEnumValueImpl();
+        instance.setKey(template.getKey());
+        instance.setLabel(template.getLabel());
+        return instance;
+    }
+
+    /**
+     * factory method to create a deep copy of AttributePlainEnumValue
+     * @param template instance to be copied
+     * @return copy instance
+     */
+    @Nullable
+    public static AttributePlainEnumValue deepCopy(@Nullable final AttributePlainEnumValue template) {
+        if (template == null) {
+            return null;
+        }
+        AttributePlainEnumValueImpl instance = new AttributePlainEnumValueImpl();
+        instance.setKey(template.getKey());
+        instance.setLabel(template.getLabel());
+        return instance;
+    }
+
+    /**
+     * builder factory method for AttributePlainEnumValue
+     * @return builder
+     */
+    public static AttributePlainEnumValueBuilder builder() {
+        return AttributePlainEnumValueBuilder.of();
+    }
+
+    /**
+     * create builder for AttributePlainEnumValue instance
+     * @param template instance with prefilled values for the builder
+     * @return builder
+     */
+    public static AttributePlainEnumValueBuilder builder(final AttributePlainEnumValue template) {
+        return AttributePlainEnumValueBuilder.of(template);
+    }
+
+    /**
+     * accessor map function
+     * @param <T> mapped type
+     * @param helper function to map the object
+     * @return mapped value
+     */
+    default <T> T withAttributePlainEnumValue(Function<AttributePlainEnumValue, T> helper) {
+        return helper.apply(this);
+    }
+
+    /**
+     * gives a TypeReference for usage with Jackson DataBind
+     * @return TypeReference
+     */
+    public static com.fasterxml.jackson.core.type.TypeReference<AttributePlainEnumValue> typeReference() {
+        return new com.fasterxml.jackson.core.type.TypeReference<AttributePlainEnumValue>() {
+            @Override
+            public String toString() {
+                return "TypeReference<AttributePlainEnumValue>";
+            }
+        };
+    }
+}
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueBuilder.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueBuilder.java
new file mode 100644
index 00000000000..0430668877b
--- /dev/null
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueBuilder.java
@@ -0,0 +1,107 @@
+
+package com.commercetools.history.models.common;
+
+import java.util.*;
+
+import io.vrap.rmf.base.client.Builder;
+import io.vrap.rmf.base.client.utils.Generated;
+
+/**
+ * AttributePlainEnumValueBuilder
+ * <hr>
+ * Example to create an instance using the builder pattern
+ * <div class=code-example>
+ * <pre><code class='java'>
+ *     AttributePlainEnumValue attributePlainEnumValue = AttributePlainEnumValue.builder()
+ *             .key("{key}")
+ *             .label("{label}")
+ *             .build()
+ * </code></pre>
+ * </div>
+ */
+@Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
+public class AttributePlainEnumValueBuilder implements Builder<AttributePlainEnumValue> {
+
+    private String key;
+
+    private String label;
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     * @param key value to be set
+     * @return Builder
+     */
+
+    public AttributePlainEnumValueBuilder key(final String key) {
+        this.key = key;
+        return this;
+    }
+
+    /**
+     *  <p>Descriptive label of the value.</p>
+     * @param label value to be set
+     * @return Builder
+     */
+
+    public AttributePlainEnumValueBuilder label(final String label) {
+        this.label = label;
+        return this;
+    }
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     * @return key
+     */
+
+    public String getKey() {
+        return this.key;
+    }
+
+    /**
+     *  <p>Descriptive label of the value.</p>
+     * @return label
+     */
+
+    public String getLabel() {
+        return this.label;
+    }
+
+    /**
+     * builds AttributePlainEnumValue with checking for non-null required values
+     * @return AttributePlainEnumValue
+     */
+    public AttributePlainEnumValue build() {
+        Objects.requireNonNull(key, AttributePlainEnumValue.class + ": key is missing");
+        Objects.requireNonNull(label, AttributePlainEnumValue.class + ": label is missing");
+        return new AttributePlainEnumValueImpl(key, label);
+    }
+
+    /**
+     * builds AttributePlainEnumValue without checking for non-null required values
+     * @return AttributePlainEnumValue
+     */
+    public AttributePlainEnumValue buildUnchecked() {
+        return new AttributePlainEnumValueImpl(key, label);
+    }
+
+    /**
+     * factory method for an instance of AttributePlainEnumValueBuilder
+     * @return builder
+     */
+    public static AttributePlainEnumValueBuilder of() {
+        return new AttributePlainEnumValueBuilder();
+    }
+
+    /**
+     * create builder for AttributePlainEnumValue instance
+     * @param template instance with prefilled values for the builder
+     * @return builder
+     */
+    public static AttributePlainEnumValueBuilder of(final AttributePlainEnumValue template) {
+        AttributePlainEnumValueBuilder builder = new AttributePlainEnumValueBuilder();
+        builder.key = template.getKey();
+        builder.label = template.getLabel();
+        return builder;
+    }
+
+}
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueImpl.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueImpl.java
new file mode 100644
index 00000000000..248be829df2
--- /dev/null
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueImpl.java
@@ -0,0 +1,97 @@
+
+package com.commercetools.history.models.common;
+
+import java.time.*;
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.*;
+
+import io.vrap.rmf.base.client.ModelBase;
+import io.vrap.rmf.base.client.utils.Generated;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ *  <p>A plain enum value must be unique within the enum, else a DuplicateEnumValues error is returned.</p>
+ */
+@Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
+public class AttributePlainEnumValueImpl implements AttributePlainEnumValue, ModelBase {
+
+    private String key;
+
+    private String label;
+
+    /**
+     * create instance with all properties
+     */
+    @JsonCreator
+    AttributePlainEnumValueImpl(@JsonProperty("key") final String key, @JsonProperty("label") final String label) {
+        this.key = key;
+        this.label = label;
+    }
+
+    /**
+     * create empty instance
+     */
+    public AttributePlainEnumValueImpl() {
+    }
+
+    /**
+     *  <p>Key of the value used as a programmatic identifier, for example in facets &amp; filters.</p>
+     */
+
+    public String getKey() {
+        return this.key;
+    }
+
+    /**
+     *  <p>Descriptive label of the value.</p>
+     */
+
+    public String getLabel() {
+        return this.label;
+    }
+
+    public void setKey(final String key) {
+        this.key = key;
+    }
+
+    public void setLabel(final String label) {
+        this.label = label;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (o == null || getClass() != o.getClass())
+            return false;
+
+        AttributePlainEnumValueImpl that = (AttributePlainEnumValueImpl) o;
+
+        return new EqualsBuilder().append(key, that.key)
+                .append(label, that.label)
+                .append(key, that.key)
+                .append(label, that.label)
+                .isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37).append(key).append(label).toHashCode();
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("key", key)
+                .append("label", label)
+                .build();
+    }
+
+}
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/ChannelRole.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/ChannelRoleEnum.java
similarity index 71%
rename from commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/ChannelRole.java
rename to commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/ChannelRoleEnum.java
index f7bc8cd0987..190ac6a9089 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/ChannelRole.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/ChannelRoleEnum.java
@@ -11,25 +11,25 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 /**
- * ChannelRole
+ *  <p>Describes the purpose and type of the Channel. A Channel can have one or more roles.</p>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-public interface ChannelRole extends JsonEnum {
+public interface ChannelRoleEnum extends JsonEnum {
 
-    ChannelRole INVENTORY_SUPPLY = ChannelRoleEnum.INVENTORY_SUPPLY;
+    ChannelRoleEnum INVENTORY_SUPPLY = ChannelRoleEnumEnum.INVENTORY_SUPPLY;
 
-    ChannelRole PRODUCT_DISTRIBUTION = ChannelRoleEnum.PRODUCT_DISTRIBUTION;
+    ChannelRoleEnum PRODUCT_DISTRIBUTION = ChannelRoleEnumEnum.PRODUCT_DISTRIBUTION;
 
-    ChannelRole ORDER_EXPORT = ChannelRoleEnum.ORDER_EXPORT;
+    ChannelRoleEnum ORDER_EXPORT = ChannelRoleEnumEnum.ORDER_EXPORT;
 
-    ChannelRole ORDER_IMPORT = ChannelRoleEnum.ORDER_IMPORT;
+    ChannelRoleEnum ORDER_IMPORT = ChannelRoleEnumEnum.ORDER_IMPORT;
 
-    ChannelRole PRIMARY = ChannelRoleEnum.PRIMARY;
+    ChannelRoleEnum PRIMARY = ChannelRoleEnumEnum.PRIMARY;
 
     /**
-     * possible values of ChannelRole
+     * possible values of ChannelRoleEnum
      */
-    enum ChannelRoleEnum implements ChannelRole {
+    enum ChannelRoleEnumEnum implements ChannelRoleEnum {
         /**
          * InventorySupply
          */
@@ -56,7 +56,7 @@ enum ChannelRoleEnum implements ChannelRole {
         PRIMARY("Primary");
         private final String jsonName;
 
-        private ChannelRoleEnum(final String jsonName) {
+        private ChannelRoleEnumEnum(final String jsonName) {
             this.jsonName = jsonName;
         }
 
@@ -89,14 +89,14 @@ public String toString() {
     String toString();
 
     /**
-     * factory method for a enum value of ChannelRole
+     * factory method for a enum value of ChannelRoleEnum
      * if no enum has been found an anonymous instance will be created
      * @param value the enum value to be wrapped
      * @return enum instance
      */
     @JsonCreator
-    public static ChannelRole findEnum(String value) {
-        return findEnumViaJsonName(value).orElse(new ChannelRole() {
+    public static ChannelRoleEnum findEnum(String value) {
+        return findEnumViaJsonName(value).orElse(new ChannelRoleEnum() {
             @Override
             public String getJsonName() {
                 return value;
@@ -118,7 +118,7 @@ public String toString() {
      * @param jsonName the json value to be wrapped
      * @return optional of enum instance
      */
-    public static Optional<ChannelRole> findEnumViaJsonName(String jsonName) {
+    public static Optional<ChannelRoleEnum> findEnumViaJsonName(String jsonName) {
         return Arrays.stream(values()).filter(t -> t.getJsonName().equals(jsonName)).findFirst();
     }
 
@@ -126,8 +126,8 @@ public static Optional<ChannelRole> findEnumViaJsonName(String jsonName) {
      * possible enum values
      * @return array of possible enum values
      */
-    public static ChannelRole[] values() {
-        return ChannelRoleEnum.values();
+    public static ChannelRoleEnum[] values() {
+        return ChannelRoleEnumEnum.values();
     }
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateRole.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateRoleEnum.java
similarity index 72%
rename from commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateRole.java
rename to commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateRoleEnum.java
index a680218b82b..899dd09661f 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateRole.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateRoleEnum.java
@@ -11,19 +11,19 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 /**
- * StateRole
+ *  <p>For some resource types, a State can fulfill the following predefined roles:</p>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-public interface StateRole extends JsonEnum {
+public interface StateRoleEnum extends JsonEnum {
 
-    StateRole REVIEW_INCLUDED_IN_STATISTICS = StateRoleEnum.REVIEW_INCLUDED_IN_STATISTICS;
+    StateRoleEnum REVIEW_INCLUDED_IN_STATISTICS = StateRoleEnumEnum.REVIEW_INCLUDED_IN_STATISTICS;
 
-    StateRole RETURN = StateRoleEnum.RETURN;
+    StateRoleEnum RETURN = StateRoleEnumEnum.RETURN;
 
     /**
-     * possible values of StateRole
+     * possible values of StateRoleEnum
      */
-    enum StateRoleEnum implements StateRole {
+    enum StateRoleEnumEnum implements StateRoleEnum {
         /**
          * ReviewIncludedInStatistics
          */
@@ -35,7 +35,7 @@ enum StateRoleEnum implements StateRole {
         RETURN("Return");
         private final String jsonName;
 
-        private StateRoleEnum(final String jsonName) {
+        private StateRoleEnumEnum(final String jsonName) {
             this.jsonName = jsonName;
         }
 
@@ -68,14 +68,14 @@ public String toString() {
     String toString();
 
     /**
-     * factory method for a enum value of StateRole
+     * factory method for a enum value of StateRoleEnum
      * if no enum has been found an anonymous instance will be created
      * @param value the enum value to be wrapped
      * @return enum instance
      */
     @JsonCreator
-    public static StateRole findEnum(String value) {
-        return findEnumViaJsonName(value).orElse(new StateRole() {
+    public static StateRoleEnum findEnum(String value) {
+        return findEnumViaJsonName(value).orElse(new StateRoleEnum() {
             @Override
             public String getJsonName() {
                 return value;
@@ -97,7 +97,7 @@ public String toString() {
      * @param jsonName the json value to be wrapped
      * @return optional of enum instance
      */
-    public static Optional<StateRole> findEnumViaJsonName(String jsonName) {
+    public static Optional<StateRoleEnum> findEnumViaJsonName(String jsonName) {
         return Arrays.stream(values()).filter(t -> t.getJsonName().equals(jsonName)).findFirst();
     }
 
@@ -105,8 +105,8 @@ public static Optional<StateRole> findEnumViaJsonName(String jsonName) {
      * possible enum values
      * @return array of possible enum values
      */
-    public static StateRole[] values() {
-        return StateRoleEnum.values();
+    public static StateRoleEnum[] values() {
+        return StateRoleEnumEnum.values();
     }
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateType.java b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateTypeEnum.java
similarity index 60%
rename from commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateType.java
rename to commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateTypeEnum.java
index 53b7b8a6ab2..11a650f71a4 100644
--- a/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateType.java
+++ b/commercetools/commercetools-sdk-java-history/src/main/java-generated/com/commercetools/history/models/common/StateTypeEnum.java
@@ -11,25 +11,31 @@
 import io.vrap.rmf.base.client.utils.Generated;
 
 /**
- * StateType
+ *  <p>Resource or object type the State can be assigned to.</p>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")
-public interface StateType extends JsonEnum {
+public interface StateTypeEnum extends JsonEnum {
 
-    StateType ORDER_STATE = StateTypeEnum.ORDER_STATE;
+    StateTypeEnum ORDER_STATE = StateTypeEnumEnum.ORDER_STATE;
 
-    StateType LINE_ITEM_STATE = StateTypeEnum.LINE_ITEM_STATE;
+    StateTypeEnum LINE_ITEM_STATE = StateTypeEnumEnum.LINE_ITEM_STATE;
 
-    StateType PRODUCT_STATE = StateTypeEnum.PRODUCT_STATE;
+    StateTypeEnum PRODUCT_STATE = StateTypeEnumEnum.PRODUCT_STATE;
 
-    StateType REVIEW_STATE = StateTypeEnum.REVIEW_STATE;
+    StateTypeEnum REVIEW_STATE = StateTypeEnumEnum.REVIEW_STATE;
 
-    StateType PAYMENT_STATE = StateTypeEnum.PAYMENT_STATE;
+    StateTypeEnum PAYMENT_STATE = StateTypeEnumEnum.PAYMENT_STATE;
+
+    StateTypeEnum QUOTE_REQUEST_STATE = StateTypeEnumEnum.QUOTE_REQUEST_STATE;
+
+    StateTypeEnum STAGED_QUOTE_STATE = StateTypeEnumEnum.STAGED_QUOTE_STATE;
+
+    StateTypeEnum QUOTE_STATE = StateTypeEnumEnum.QUOTE_STATE;
 
     /**
-     * possible values of StateType
+     * possible values of StateTypeEnum
      */
-    enum StateTypeEnum implements StateType {
+    enum StateTypeEnumEnum implements StateTypeEnum {
         /**
          * OrderState
          */
@@ -53,10 +59,25 @@ enum StateTypeEnum implements StateType {
         /**
          * PaymentState
          */
-        PAYMENT_STATE("PaymentState");
+        PAYMENT_STATE("PaymentState"),
+
+        /**
+         * QuoteRequestState
+         */
+        QUOTE_REQUEST_STATE("QuoteRequestState"),
+
+        /**
+         * StagedQuoteState
+         */
+        STAGED_QUOTE_STATE("StagedQuoteState"),
+
+        /**
+         * QuoteState
+         */
+        QUOTE_STATE("QuoteState");
         private final String jsonName;
 
-        private StateTypeEnum(final String jsonName) {
+        private StateTypeEnumEnum(final String jsonName) {
             this.jsonName = jsonName;
         }
 
@@ -89,14 +110,14 @@ public String toString() {
     String toString();
 
     /**
-     * factory method for a enum value of StateType
+     * factory method for a enum value of StateTypeEnum
      * if no enum has been found an anonymous instance will be created
      * @param value the enum value to be wrapped
      * @return enum instance
      */
     @JsonCreator
-    public static StateType findEnum(String value) {
-        return findEnumViaJsonName(value).orElse(new StateType() {
+    public static StateTypeEnum findEnum(String value) {
+        return findEnumViaJsonName(value).orElse(new StateTypeEnum() {
             @Override
             public String getJsonName() {
                 return value;
@@ -118,7 +139,7 @@ public String toString() {
      * @param jsonName the json value to be wrapped
      * @return optional of enum instance
      */
-    public static Optional<StateType> findEnumViaJsonName(String jsonName) {
+    public static Optional<StateTypeEnum> findEnumViaJsonName(String jsonName) {
         return Arrays.stream(values()).filter(t -> t.getJsonName().equals(jsonName)).findFirst();
     }
 
@@ -126,8 +147,8 @@ public static Optional<StateType> findEnumViaJsonName(String jsonName) {
      * possible enum values
      * @return array of possible enum values
      */
-    public static StateType[] values() {
-        return StateTypeEnum.values();
+    public static StateTypeEnum[] values() {
+        return StateTypeEnumEnum.values();
     }
 
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAddressChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAddressChangeTest.java
index ed2f3fa75fd..e8aa2cef44d 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAddressChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddAddressChangeTest.java
@@ -24,11 +24,8 @@ public void buildUnchecked(AddAddressChangeBuilder builder) {
 
     @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddAddressChange.builder().change("change") },
-                new Object[] { AddAddressChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.AddressImpl()) },
-                new Object[] { AddAddressChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
+        return new Object[][] { new Object[] { AddAddressChange.builder().change("change") }, new Object[] {
+                AddAddressChange.builder().nextValue(new com.commercetools.history.models.common.AddressImpl()) } };
     }
 
     @Test
@@ -38,14 +35,6 @@ public void change() {
         Assertions.assertThat(value.getChange()).isEqualTo("change");
     }
 
-    @Test
-    public void previousValue() {
-        AddAddressChange value = AddAddressChange.of();
-        value.setPreviousValue(new com.commercetools.history.models.common.AddressImpl());
-        Assertions.assertThat(value.getPreviousValue())
-                .isEqualTo(new com.commercetools.history.models.common.AddressImpl());
-    }
-
     @Test
     public void nextValue() {
         AddAddressChange value = AddAddressChange.of();
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeTest.java
index c1eb9ac8b48..a93dd26ee11 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddChannelRolesChangeTest.java
@@ -29,10 +29,10 @@ public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { AddChannelRolesChange.builder().change("change") },
                 new Object[] { AddChannelRolesChange.builder()
                         .previousValue(Collections.singletonList(
-                            com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply"))) },
+                            com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) },
                 new Object[] { AddChannelRolesChange.builder()
                         .nextValue(Collections.singletonList(
-                            com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply"))) } };
+                            com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
 
     @Test
@@ -45,20 +45,20 @@ public void change() {
     @Test
     public void previousValue() {
         AddChannelRolesChange value = AddChannelRolesChange.of();
-        value.setPreviousValue(
-            Collections.singletonList(com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+        value.setPreviousValue(Collections
+                .singletonList(com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
         Assertions.assertThat(value.getPreviousValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+                    com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
     }
 
     @Test
     public void nextValue() {
         AddChannelRolesChange value = AddChannelRolesChange.of();
-        value.setNextValue(
-            Collections.singletonList(com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+        value.setNextValue(Collections
+                .singletonList(com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
         Assertions.assertThat(value.getNextValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+                    com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
     }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeTest.java
index 6da99d0d5dc..7231e862ae1 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocalizedEnumValueChangeTest.java
@@ -26,7 +26,7 @@ public void buildUnchecked(AddLocalizedEnumValueChangeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { AddLocalizedEnumValueChange.builder().change("change") },
                 new Object[] { AddLocalizedEnumValueChange.builder()
-                        .nextValue(new com.commercetools.history.models.change_value.LocalizedEnumValueImpl()) },
+                        .nextValue(new com.commercetools.history.models.common.AttributeLocalizedEnumValueImpl()) },
                 new Object[] { AddLocalizedEnumValueChange.builder().fieldName("fieldName") },
                 new Object[] { AddLocalizedEnumValueChange.builder().attributeName("attributeName") } };
     }
@@ -41,9 +41,9 @@ public void change() {
     @Test
     public void nextValue() {
         AddLocalizedEnumValueChange value = AddLocalizedEnumValueChange.of();
-        value.setNextValue(new com.commercetools.history.models.change_value.LocalizedEnumValueImpl());
+        value.setNextValue(new com.commercetools.history.models.common.AttributeLocalizedEnumValueImpl());
         Assertions.assertThat(value.getNextValue())
-                .isEqualTo(new com.commercetools.history.models.change_value.LocalizedEnumValueImpl());
+                .isEqualTo(new com.commercetools.history.models.common.AttributeLocalizedEnumValueImpl());
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocationChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocationChangeTest.java
index 328b1a84dea..82fe2fb991a 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocationChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddLocationChangeTest.java
@@ -24,11 +24,8 @@ public void buildUnchecked(AddLocationChangeBuilder builder) {
 
     @DataProvider
     public static Object[][] objectBuilder() {
-        return new Object[][] { new Object[] { AddLocationChange.builder().change("change") },
-                new Object[] { AddLocationChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocationImpl()) },
-                new Object[] { AddLocationChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocationImpl()) } };
+        return new Object[][] { new Object[] { AddLocationChange.builder().change("change") }, new Object[] {
+                AddLocationChange.builder().nextValue(new com.commercetools.history.models.common.LocationImpl()) } };
     }
 
     @Test
@@ -38,14 +35,6 @@ public void change() {
         Assertions.assertThat(value.getChange()).isEqualTo("change");
     }
 
-    @Test
-    public void previousValue() {
-        AddLocationChange value = AddLocationChange.of();
-        value.setPreviousValue(new com.commercetools.history.models.common.LocationImpl());
-        Assertions.assertThat(value.getPreviousValue())
-                .isEqualTo(new com.commercetools.history.models.common.LocationImpl());
-    }
-
     @Test
     public void nextValue() {
         AddLocationChange value = AddLocationChange.of();
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeTest.java
index 009bc727599..9ff564f8433 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddPlainEnumValueChangeTest.java
@@ -26,7 +26,7 @@ public void buildUnchecked(AddPlainEnumValueChangeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { AddPlainEnumValueChange.builder().change("change") },
                 new Object[] { AddPlainEnumValueChange.builder()
-                        .nextValue(new com.commercetools.history.models.change_value.EnumValueImpl()) },
+                        .nextValue(new com.commercetools.history.models.common.AttributePlainEnumValueImpl()) },
                 new Object[] { AddPlainEnumValueChange.builder().attributeName("attributeName") } };
     }
 
@@ -40,9 +40,9 @@ public void change() {
     @Test
     public void nextValue() {
         AddPlainEnumValueChange value = AddPlainEnumValueChange.of();
-        value.setNextValue(new com.commercetools.history.models.change_value.EnumValueImpl());
+        value.setNextValue(new com.commercetools.history.models.common.AttributePlainEnumValueImpl());
         Assertions.assertThat(value.getNextValue())
-                .isEqualTo(new com.commercetools.history.models.change_value.EnumValueImpl());
+                .isEqualTo(new com.commercetools.history.models.common.AttributePlainEnumValueImpl());
     }
 
     @Test
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddStateRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddStateRolesChangeTest.java
index 2b422fb62b7..b40639b2075 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddStateRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/AddStateRolesChangeTest.java
@@ -28,10 +28,10 @@ public void buildUnchecked(AddStateRolesChangeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { AddStateRolesChange.builder().change("change") },
                 new Object[] { AddStateRolesChange.builder()
-                        .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRole
+                        .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) },
                 new Object[] { AddStateRolesChange.builder()
-                        .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRole
+                        .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) } };
     }
 
@@ -46,19 +46,19 @@ public void change() {
     public void previousValue() {
         AddStateRolesChange value = AddStateRolesChange.of();
         value.setPreviousValue(Collections.singletonList(
-            com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+            com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
         Assertions.assertThat(value.getPreviousValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+                    com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
     }
 
     @Test
     public void nextValue() {
         AddStateRolesChange value = AddStateRolesChange.of();
         value.setNextValue(Collections.singletonList(
-            com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+            com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
         Assertions.assertThat(value.getNextValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+                    com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
     }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeTest.java
index 93e2564beb7..6614e5f7b13 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/ChangeStateTypeChangeTest.java
@@ -26,9 +26,9 @@ public void buildUnchecked(ChangeStateTypeChangeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { ChangeStateTypeChange.builder().change("change") },
                 new Object[] { ChangeStateTypeChange.builder()
-                        .previousValue(com.commercetools.history.models.common.StateType.findEnum("OrderState")) },
+                        .previousValue(com.commercetools.history.models.common.StateTypeEnum.findEnum("OrderState")) },
                 new Object[] { ChangeStateTypeChange.builder()
-                        .nextValue(com.commercetools.history.models.common.StateType.findEnum("OrderState")) } };
+                        .nextValue(com.commercetools.history.models.common.StateTypeEnum.findEnum("OrderState")) } };
     }
 
     @Test
@@ -41,16 +41,16 @@ public void change() {
     @Test
     public void previousValue() {
         ChangeStateTypeChange value = ChangeStateTypeChange.of();
-        value.setPreviousValue(com.commercetools.history.models.common.StateType.findEnum("OrderState"));
+        value.setPreviousValue(com.commercetools.history.models.common.StateTypeEnum.findEnum("OrderState"));
         Assertions.assertThat(value.getPreviousValue())
-                .isEqualTo(com.commercetools.history.models.common.StateType.findEnum("OrderState"));
+                .isEqualTo(com.commercetools.history.models.common.StateTypeEnum.findEnum("OrderState"));
     }
 
     @Test
     public void nextValue() {
         ChangeStateTypeChange value = ChangeStateTypeChange.of();
-        value.setNextValue(com.commercetools.history.models.common.StateType.findEnum("OrderState"));
+        value.setNextValue(com.commercetools.history.models.common.StateTypeEnum.findEnum("OrderState"));
         Assertions.assertThat(value.getNextValue())
-                .isEqualTo(com.commercetools.history.models.common.StateType.findEnum("OrderState"));
+                .isEqualTo(com.commercetools.history.models.common.StateTypeEnum.findEnum("OrderState"));
     }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeTest.java
index 46ff16b6281..25090a4e690 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveChannelRolesChangeTest.java
@@ -29,10 +29,10 @@ public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { RemoveChannelRolesChange.builder().change("change") },
                 new Object[] { RemoveChannelRolesChange.builder()
                         .previousValue(Collections.singletonList(
-                            com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply"))) },
+                            com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) },
                 new Object[] { RemoveChannelRolesChange.builder()
                         .nextValue(Collections.singletonList(
-                            com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply"))) } };
+                            com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
 
     @Test
@@ -45,20 +45,20 @@ public void change() {
     @Test
     public void previousValue() {
         RemoveChannelRolesChange value = RemoveChannelRolesChange.of();
-        value.setPreviousValue(
-            Collections.singletonList(com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+        value.setPreviousValue(Collections
+                .singletonList(com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
         Assertions.assertThat(value.getPreviousValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+                    com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
     }
 
     @Test
     public void nextValue() {
         RemoveChannelRolesChange value = RemoveChannelRolesChange.of();
-        value.setNextValue(
-            Collections.singletonList(com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+        value.setNextValue(Collections
+                .singletonList(com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
         Assertions.assertThat(value.getNextValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+                    com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
     }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocationChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocationChangeTest.java
index 57f13bfab6f..187273761fb 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocationChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveLocationChangeTest.java
@@ -26,9 +26,7 @@ public void buildUnchecked(RemoveLocationChangeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { RemoveLocationChange.builder().change("change") },
                 new Object[] { RemoveLocationChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.LocationImpl()) },
-                new Object[] { RemoveLocationChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.LocationImpl()) } };
+                        .previousValue(new com.commercetools.history.models.common.LocationImpl()) } };
     }
 
     @Test
@@ -45,12 +43,4 @@ public void previousValue() {
         Assertions.assertThat(value.getPreviousValue())
                 .isEqualTo(new com.commercetools.history.models.common.LocationImpl());
     }
-
-    @Test
-    public void nextValue() {
-        RemoveLocationChange value = RemoveLocationChange.of();
-        value.setNextValue(new com.commercetools.history.models.common.LocationImpl());
-        Assertions.assertThat(value.getNextValue())
-                .isEqualTo(new com.commercetools.history.models.common.LocationImpl());
-    }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeTest.java
index 6758fcb3055..1938df12757 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveStateRolesChangeTest.java
@@ -28,10 +28,10 @@ public void buildUnchecked(RemoveStateRolesChangeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { RemoveStateRolesChange.builder().change("change") },
                 new Object[] { RemoveStateRolesChange.builder()
-                        .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRole
+                        .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) },
                 new Object[] { RemoveStateRolesChange.builder()
-                        .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRole
+                        .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) } };
     }
 
@@ -46,19 +46,19 @@ public void change() {
     public void previousValue() {
         RemoveStateRolesChange value = RemoveStateRolesChange.of();
         value.setPreviousValue(Collections.singletonList(
-            com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+            com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
         Assertions.assertThat(value.getPreviousValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+                    com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
     }
 
     @Test
     public void nextValue() {
         RemoveStateRolesChange value = RemoveStateRolesChange.of();
         value.setNextValue(Collections.singletonList(
-            com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+            com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
         Assertions.assertThat(value.getNextValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+                    com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
     }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeTest.java
index e131d733ac8..62871886b10 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/RemoveTaxRateChangeTest.java
@@ -26,9 +26,7 @@ public void buildUnchecked(RemoveTaxRateChangeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { RemoveTaxRateChange.builder().change("change") },
                 new Object[] { RemoveTaxRateChange.builder()
-                        .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) },
-                new Object[] { RemoveTaxRateChange.builder()
-                        .nextValue(new com.commercetools.history.models.common.TaxRateImpl()) } };
+                        .previousValue(new com.commercetools.history.models.common.TaxRateImpl()) } };
     }
 
     @Test
@@ -45,12 +43,4 @@ public void previousValue() {
         Assertions.assertThat(value.getPreviousValue())
                 .isEqualTo(new com.commercetools.history.models.common.TaxRateImpl());
     }
-
-    @Test
-    public void nextValue() {
-        RemoveTaxRateChange value = RemoveTaxRateChange.of();
-        value.setNextValue(new com.commercetools.history.models.common.TaxRateImpl());
-        Assertions.assertThat(value.getNextValue())
-                .isEqualTo(new com.commercetools.history.models.common.TaxRateImpl());
-    }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeTest.java
index 2007c019b6c..8dc632cf172 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetChannelRolesChangeTest.java
@@ -29,10 +29,10 @@ public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { SetChannelRolesChange.builder().change("change") },
                 new Object[] { SetChannelRolesChange.builder()
                         .previousValue(Collections.singletonList(
-                            com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply"))) },
+                            com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) },
                 new Object[] { SetChannelRolesChange.builder()
                         .nextValue(Collections.singletonList(
-                            com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply"))) } };
+                            com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply"))) } };
     }
 
     @Test
@@ -45,20 +45,20 @@ public void change() {
     @Test
     public void previousValue() {
         SetChannelRolesChange value = SetChannelRolesChange.of();
-        value.setPreviousValue(
-            Collections.singletonList(com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+        value.setPreviousValue(Collections
+                .singletonList(com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
         Assertions.assertThat(value.getPreviousValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+                    com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
     }
 
     @Test
     public void nextValue() {
         SetChannelRolesChange value = SetChannelRolesChange.of();
-        value.setNextValue(
-            Collections.singletonList(com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+        value.setNextValue(Collections
+                .singletonList(com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
         Assertions.assertThat(value.getNextValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.ChannelRole.findEnum("InventorySupply")));
+                    com.commercetools.history.models.common.ChannelRoleEnum.findEnum("InventorySupply")));
     }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStateRolesChangeTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStateRolesChangeTest.java
index 9787fa59f6a..d70e7cdcb43 100644
--- a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStateRolesChangeTest.java
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/change/SetStateRolesChangeTest.java
@@ -28,10 +28,10 @@ public void buildUnchecked(SetStateRolesChangeBuilder builder) {
     public static Object[][] objectBuilder() {
         return new Object[][] { new Object[] { SetStateRolesChange.builder().change("change") },
                 new Object[] { SetStateRolesChange.builder()
-                        .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRole
+                        .previousValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) },
                 new Object[] { SetStateRolesChange.builder()
-                        .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRole
+                        .nextValue(Collections.singletonList(com.commercetools.history.models.common.StateRoleEnum
                                 .findEnum("ReviewIncludedInStatistics"))) } };
     }
 
@@ -46,19 +46,19 @@ public void change() {
     public void previousValue() {
         SetStateRolesChange value = SetStateRolesChange.of();
         value.setPreviousValue(Collections.singletonList(
-            com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+            com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
         Assertions.assertThat(value.getPreviousValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+                    com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
     }
 
     @Test
     public void nextValue() {
         SetStateRolesChange value = SetStateRolesChange.of();
         value.setNextValue(Collections.singletonList(
-            com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+            com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
         Assertions.assertThat(value.getNextValue())
                 .isEqualTo(Collections.singletonList(
-                    com.commercetools.history.models.common.StateRole.findEnum("ReviewIncludedInStatistics")));
+                    com.commercetools.history.models.common.StateRoleEnum.findEnum("ReviewIncludedInStatistics")));
     }
 }
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueTest.java
new file mode 100644
index 00000000000..5c588b38042
--- /dev/null
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributeLocalizedEnumValueTest.java
@@ -0,0 +1,46 @@
+
+package com.commercetools.history.models.common;
+
+import com.tngtech.junit.dataprovider.DataProvider;
+import com.tngtech.junit.dataprovider.DataProviderExtension;
+import com.tngtech.junit.dataprovider.UseDataProvider;
+import com.tngtech.junit.dataprovider.UseDataProviderExtension;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(UseDataProviderExtension.class)
+@ExtendWith(DataProviderExtension.class)
+public class AttributeLocalizedEnumValueTest {
+
+    @TestTemplate
+    @UseDataProvider("objectBuilder")
+    public void buildUnchecked(AttributeLocalizedEnumValueBuilder builder) {
+        AttributeLocalizedEnumValue attributeLocalizedEnumValue = builder.buildUnchecked();
+        Assertions.assertThat(attributeLocalizedEnumValue).isInstanceOf(AttributeLocalizedEnumValue.class);
+    }
+
+    @DataProvider
+    public static Object[][] objectBuilder() {
+        return new Object[][] { new Object[] { AttributeLocalizedEnumValue.builder().key("key") },
+                new Object[] { AttributeLocalizedEnumValue.builder()
+                        .label(new com.commercetools.history.models.common.LocalizedStringImpl()) } };
+    }
+
+    @Test
+    public void key() {
+        AttributeLocalizedEnumValue value = AttributeLocalizedEnumValue.of();
+        value.setKey("key");
+        Assertions.assertThat(value.getKey()).isEqualTo("key");
+    }
+
+    @Test
+    public void label() {
+        AttributeLocalizedEnumValue value = AttributeLocalizedEnumValue.of();
+        value.setLabel(new com.commercetools.history.models.common.LocalizedStringImpl());
+        Assertions.assertThat(value.getLabel())
+                .isEqualTo(new com.commercetools.history.models.common.LocalizedStringImpl());
+    }
+}
diff --git a/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueTest.java b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueTest.java
new file mode 100644
index 00000000000..69db8556f9a
--- /dev/null
+++ b/commercetools/commercetools-sdk-java-history/src/test/java-generated/com/commercetools/history/models/common/AttributePlainEnumValueTest.java
@@ -0,0 +1,44 @@
+
+package com.commercetools.history.models.common;
+
+import com.tngtech.junit.dataprovider.DataProvider;
+import com.tngtech.junit.dataprovider.DataProviderExtension;
+import com.tngtech.junit.dataprovider.UseDataProvider;
+import com.tngtech.junit.dataprovider.UseDataProviderExtension;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestTemplate;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(UseDataProviderExtension.class)
+@ExtendWith(DataProviderExtension.class)
+public class AttributePlainEnumValueTest {
+
+    @TestTemplate
+    @UseDataProvider("objectBuilder")
+    public void buildUnchecked(AttributePlainEnumValueBuilder builder) {
+        AttributePlainEnumValue attributePlainEnumValue = builder.buildUnchecked();
+        Assertions.assertThat(attributePlainEnumValue).isInstanceOf(AttributePlainEnumValue.class);
+    }
+
+    @DataProvider
+    public static Object[][] objectBuilder() {
+        return new Object[][] { new Object[] { AttributePlainEnumValue.builder().key("key") },
+                new Object[] { AttributePlainEnumValue.builder().label("label") } };
+    }
+
+    @Test
+    public void key() {
+        AttributePlainEnumValue value = AttributePlainEnumValue.of();
+        value.setKey("key");
+        Assertions.assertThat(value.getKey()).isEqualTo("key");
+    }
+
+    @Test
+    public void label() {
+        AttributePlainEnumValue value = AttributePlainEnumValue.of();
+        value.setLabel("label");
+        Assertions.assertThat(value.getLabel()).isEqualTo("label");
+    }
+}
diff --git a/reference.txt b/reference.txt
new file mode 100644
index 00000000000..4f680d7bd63
--- /dev/null
+++ b/reference.txt
@@ -0,0 +1 @@
+0b026711ef7a826b607401ecc1e60e89b05e778a
diff --git a/references.txt b/references.txt
index 3918ebe10c7..f0060696484 100644
--- a/references.txt
+++ b/references.txt
@@ -153,3 +153,12 @@ b390ee642415d99d30db66efa4ecddaf194d920a
 a9bf8d11b284086550a98ffb99550a7c6fd5e27e
 9a21b3fdb553c649790d84768f18a6e33876ee3e
 0b026711ef7a826b607401ecc1e60e89b05e778a
+df57a82adf35a75cf4d4a27212e68170550b0ad9
+d1261b427f37a7d629b64bc1dde53692eb951368
+734afcf36b8d35f56f2ad66b91795d8803390d9b
+42782cb8de2a614dbb8ee5488d8872ca797ad4c1
+dafb565c9cf91bdaad65bf8111c8748b0015184c
+38de4175b3e39979dedce5a9766cb221be43ae55
+85aae17bd44bdce82d5c034bb5af040e50b6a308
+444fc2580e5a891ae143bec23b7d531ef5820faf
+c633a41c164e2dbf2201dd9856c18d5336b0ac5d