diff --git a/client/src/test/java/com/sinch/sdk/domains/conversation/api/templates/adapters/v2/TemplatesV2ServiceTest.java b/client/src/test/java/com/sinch/sdk/domains/conversation/api/templates/adapters/v2/TemplatesV2ServiceTest.java
index 47e1d1f6c..945897100 100644
--- a/client/src/test/java/com/sinch/sdk/domains/conversation/api/templates/adapters/v2/TemplatesV2ServiceTest.java
+++ b/client/src/test/java/com/sinch/sdk/domains/conversation/api/templates/adapters/v2/TemplatesV2ServiceTest.java
@@ -57,7 +57,7 @@ public class TemplatesV2ServiceTest extends TemplatesBaseTest {
   @GivenTextResource("/domains/conversation/templates/v2/request/TemplateV2RequestDto.json")
   String jsonTemplateV2RequestDto;
 
-  @GivenTextResource("/domains/conversation/templates/v2/TemplateV2Dto.json")
+  @GivenTextResource("/domains/conversation/templates/v2/response/TemplateV2ResponseDto.json")
   String jsonTemplateV2Dto;
 
   @GivenTextResource("/domains/conversation/templates/v2/response/TemplatesV2ListResponseDto.json")
@@ -96,9 +96,9 @@ void create() throws ApiException {
             argThat(new HttpRequestMatcher(httpRequest))))
         .thenReturn(httpResponse);
 
-    TemplateV2 response = service.create(TemplateV2DtoTest.expectedDto);
+    TemplateV2 response = service.create(TemplateV2DtoTest.expectedRequestDto);
 
-    TestHelpers.recursiveEquals(response, TemplateV2DtoTest.expectedDto);
+    TestHelpers.recursiveEquals(response, TemplateV2DtoTest.expectedResponseDto);
   }
 
   @Test
@@ -109,7 +109,7 @@ void get() throws ApiException {
             String.format(
                 "/v2/projects/%s/templates/%s",
                 URLPathUtils.encodePathSegment(uriPartID),
-                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedDto.getId())),
+                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedRequestDto.getId())),
             HttpMethod.GET,
             Collections.emptyList(),
             (String) null,
@@ -126,9 +126,9 @@ void get() throws ApiException {
             argThat(new HttpRequestMatcher(httpRequest))))
         .thenReturn(httpResponse);
 
-    TemplateV2 response = service.get(TemplateV2DtoTest.expectedDto.getId());
+    TemplateV2 response = service.get(TemplateV2DtoTest.expectedRequestDto.getId());
 
-    TestHelpers.recursiveEquals(response, TemplateV2DtoTest.expectedDto);
+    TestHelpers.recursiveEquals(response, TemplateV2DtoTest.expectedResponseDto);
   }
 
   @Test
@@ -178,7 +178,7 @@ void listTranslations() throws ApiException {
             String.format(
                 "/v2/projects/%s/templates/%s/translations",
                 URLPathUtils.encodePathSegment(uriPartID),
-                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedDto.getId())),
+                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedRequestDto.getId())),
             HttpMethod.GET,
             Collections.emptyList(),
             (String) null,
@@ -197,7 +197,7 @@ void listTranslations() throws ApiException {
         .thenReturn(httpResponse);
 
     TranslationsV2ListResponse response =
-        service.listTranslations(TemplateV2DtoTest.expectedDto.getId());
+        service.listTranslations(TemplateV2DtoTest.expectedRequestDto.getId());
     Iterator<TemplateTranslation> iterator = response.iterator();
 
     TranslationsV2ListResponse expectedListResponse =
@@ -221,7 +221,7 @@ void listTranslationsWithParameters() throws ApiException {
             String.format(
                 "/v2/projects/%s/templates/%s/translations",
                 URLPathUtils.encodePathSegment(uriPartID),
-                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedDto.getId())),
+                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedRequestDto.getId())),
             HttpMethod.GET,
             Arrays.asList(
                 new URLParameter("language_code", "language code", STYLE.FORM, true),
@@ -243,7 +243,7 @@ void listTranslationsWithParameters() throws ApiException {
 
     TranslationsV2ListResponse response =
         service.listTranslations(
-            TemplateV2DtoTest.expectedDto.getId(),
+            TemplateV2DtoTest.expectedRequestDto.getId(),
             ListTranslationsQueryParameters.builder()
                 .setLanguageCode("language code")
                 .setTranslationVersion("translation version")
@@ -271,7 +271,7 @@ void update() throws ApiException {
             String.format(
                 "/v2/projects/%s/templates/%s",
                 URLPathUtils.encodePathSegment(uriPartID),
-                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedDto.getId())),
+                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedRequestDto.getId())),
             HttpMethod.PUT,
             Collections.emptyList(),
             jsonTemplateV2RequestDto,
@@ -289,9 +289,10 @@ void update() throws ApiException {
         .thenReturn(httpResponse);
 
     TemplateV2 response =
-        service.update(TemplateV2DtoTest.expectedDto.getId(), TemplateV2DtoTest.expectedDto);
+        service.update(
+            TemplateV2DtoTest.expectedRequestDto.getId(), TemplateV2DtoTest.expectedRequestDto);
 
-    TestHelpers.recursiveEquals(response, TemplateV2DtoTest.expectedDto);
+    TestHelpers.recursiveEquals(response, TemplateV2DtoTest.expectedResponseDto);
   }
 
   @Test
@@ -302,7 +303,7 @@ void delete() throws ApiException {
             String.format(
                 "/v2/projects/%s/templates/%s",
                 URLPathUtils.encodePathSegment(uriPartID),
-                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedDto.getId())),
+                URLPathUtils.encodePathSegment(TemplateV2DtoTest.expectedRequestDto.getId())),
             HttpMethod.DELETE,
             Collections.emptyList(),
             (String) null,
@@ -318,6 +319,6 @@ void delete() throws ApiException {
             argThat(new HttpRequestMatcher(httpRequest))))
         .thenReturn(httpResponse);
 
-    service.delete(TemplateV2DtoTest.expectedDto.getId());
+    service.delete(TemplateV2DtoTest.expectedResponseDto.getId());
   }
 }
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/DeliveryReportBasedFallback.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/DeliveryReportBasedFallback.java
index 50c26ddda..ed11f8056 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/DeliveryReportBasedFallback.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/apps/DeliveryReportBasedFallback.java
@@ -15,8 +15,7 @@
 /**
  * This object contains additional settings related to <a
  * href="https://developers.sinch.com/docs/conversation/keyconcepts/#delivery-report-base-message-fallback">delivery
- * report based fallback</a>. Note that this <strong>paid</strong> functionality is available for
- * open beta testing.
+ * report based fallback</a>. Note that this is <strong>paid</strong> functionality.
  */
 @JsonDeserialize(builder = DeliveryReportBasedFallbackImpl.Builder.class)
 public interface DeliveryReportBasedFallback {
@@ -34,7 +33,11 @@ public interface DeliveryReportBasedFallback {
 
   /**
    * Optional. The time, in seconds, after which a message without a positive delivery report will
-   * fallback to the next channel. The valid values for this field are [60 - 259200].
+   * fallback to the next channel.
+   *
+   * <p><b>Minimum</b>: 10
+   *
+   * <p><b>Maximum</b>: 259200
    *
    * @return deliveryReportWaitingTime
    */
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/consents/response/AuditRecord.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/consents/response/AuditRecord.java
index a4fb5c34f..a48de1a32 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/consents/response/AuditRecord.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/consents/response/AuditRecord.java
@@ -27,7 +27,10 @@ public interface AuditRecord {
    * an end-user MO).
    */
   public class OriginEnum extends EnumDynamic<String, OriginEnum> {
+    /** The opt-in or opt-out came from the API. */
     public static final OriginEnum ORIGIN_API = new OriginEnum("ORIGIN_API");
+
+    /** The opt-in or optout came from an MO. */
     public static final OriginEnum ORIGIN_MO = new OriginEnum("ORIGIN_MO");
 
     private static final EnumSupportDynamic<String, OriginEnum> ENUM_SUPPORT =
@@ -63,8 +66,13 @@ public static String valueOf(OriginEnum e) {
 
   /** The operation that the audit record refers to. Can be INSERT, UPDATE or DELETE. */
   public class OperationEnum extends EnumDynamic<String, OperationEnum> {
+    /** The Insert operation */
     public static final OperationEnum OPERATION_INSERT = new OperationEnum("OPERATION_INSERT");
+
+    /** The Update operation */
     public static final OperationEnum OPERATION_UPDATE = new OperationEnum("OPERATION_UPDATE");
+
+    /** The Delete operation */
     public static final OperationEnum OPERATION_DELETE = new OperationEnum("OPERATION_DELETE");
 
     private static final EnumSupportDynamic<String, OperationEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/conversations/request/RecentConversationsListQueryParameters.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/conversations/request/RecentConversationsListQueryParameters.java
index 799523df9..2337f5e3e 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/conversations/request/RecentConversationsListQueryParameters.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/conversations/request/RecentConversationsListQueryParameters.java
@@ -49,7 +49,10 @@ public interface RecentConversationsListQueryParameters {
 
   /** Gets or Sets order */
   public class OrderEnum extends EnumDynamic<String, OrderEnum> {
+    /** Ascending order. Oldest first. */
     public static final OrderEnum ASC = new OrderEnum("ASC");
+
+    /** Descending order. Newest first. */
     public static final OrderEnum DESC = new OrderEnum("DESC");
 
     private static final EnumSupportDynamic<String, OrderEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/credentials/ConversationChannelCredentials.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/credentials/ConversationChannelCredentials.java
index 72fcaa573..7303cd727 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/credentials/ConversationChannelCredentials.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/credentials/ConversationChannelCredentials.java
@@ -74,7 +74,9 @@ public interface ConversationChannelCredentials {
    * case in which there are multiple credential integrations per channel on a single app, this
    * field must have a unique value for each multi-credential channel entry.
    *
-   * <p>minimum: 0 maximum: 255
+   * <p><b>Minimum</b>: 0
+   *
+   * <p><b>Maximum</b>: 255
    *
    * @return credentialOrdinalNumber
    */
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentials.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentials.java
index b9496e1e8..43cc43c0e 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentials.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/eventdestinations/ClientCredentials.java
@@ -72,7 +72,16 @@ public interface ClientCredentials {
    * <code>BASIC</code> is used by default.
    */
   public class TokenRequestTypeEnum extends EnumDynamic<String, TokenRequestTypeEnum> {
+    /**
+     * Sent using the HTTP Authorization header (Basic auth). In this case, <code>client_id</code>
+     * and <code>client_secret</code> are NOT included in the form body.
+     */
     public static final TokenRequestTypeEnum BASIC = new TokenRequestTypeEnum("BASIC");
+
+    /**
+     * Sent in the form body as <code>client_id</code> and <code>client_secret</code>. No
+     * Authorization header is added.
+     */
     public static final TokenRequestTypeEnum FORM = new TokenRequestTypeEnum("FORM");
 
     private static final EnumSupportDynamic<String, TokenRequestTypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/types/CommentEvent.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/types/CommentEvent.java
index 704e651b1..f230e6926 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/types/CommentEvent.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/types/CommentEvent.java
@@ -39,7 +39,10 @@ public interface CommentEvent
 
   /** Either LIVE or FEED. Indicates the type of media on which the comment was made. */
   public class CommentTypeEnum extends EnumDynamic<String, CommentTypeEnum> {
+    /** A comment was made on a Feed post. */
     public static final CommentTypeEnum FEED = new CommentTypeEnum("FEED");
+
+    /** A comment was made during a Live. */
     public static final CommentTypeEnum LIVE = new CommentTypeEnum("LIVE");
 
     private static final EnumSupportDynamic<String, CommentTypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/types/internal/CommentEventInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/types/internal/CommentEventInternal.java
index 86080d9c4..890450cbf 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/types/internal/CommentEventInternal.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/events/types/internal/CommentEventInternal.java
@@ -42,7 +42,10 @@ public interface CommentEventInternal {
 
   /** Either LIVE or FEED. Indicates the type of media on which the comment was made. */
   public class CommentTypeEnum extends EnumDynamic<String, CommentTypeEnum> {
+    /** A comment was made on a Feed post. */
     public static final CommentTypeEnum FEED = new CommentTypeEnum("FEED");
+
+    /** A comment was made during a Live. */
     public static final CommentTypeEnum LIVE = new CommentTypeEnum("LIVE");
 
     private static final EnumSupportDynamic<String, CommentTypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/internal/ChannelSpecificMessageInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/internal/ChannelSpecificMessageInternal.java
index cdbbc2829..50e9138f5 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/internal/ChannelSpecificMessageInternal.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/internal/ChannelSpecificMessageInternal.java
@@ -22,12 +22,23 @@ public interface ChannelSpecificMessageInternal {
 
   /** The type of the channel specific message. */
   public class MessageTypeEnum extends EnumDynamic<String, MessageTypeEnum> {
+    /** The WhatsApp Flows message type. */
     public static final MessageTypeEnum FLOWS = new MessageTypeEnum("FLOWS");
+
+    /** The WhatsApp order details message type. */
     public static final MessageTypeEnum ORDER_DETAILS = new MessageTypeEnum("ORDER_DETAILS");
+
+    /** The WhatsApp order status message type. */
     public static final MessageTypeEnum ORDER_STATUS = new MessageTypeEnum("ORDER_STATUS");
+
+    /** KakaoTalk commerce channel specific message type */
     public static final MessageTypeEnum COMMERCE = new MessageTypeEnum("COMMERCE");
+
+    /** KakaoTalk carousel commerce channel specific message type */
     public static final MessageTypeEnum CAROUSEL_COMMERCE =
         new MessageTypeEnum("CAROUSEL_COMMERCE");
+
+    /** LINE notification message template type */
     public static final MessageTypeEnum NOTIFICATION_MESSAGE_TEMPLATE =
         new MessageTypeEnum("NOTIFICATION_MESSAGE_TEMPLATE");
 
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/ChannelSpecificContactMessage.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/ChannelSpecificContactMessage.java
index 2885f34a2..aa37551f1 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/ChannelSpecificContactMessage.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/ChannelSpecificContactMessage.java
@@ -23,6 +23,7 @@ public interface ChannelSpecificContactMessage
 
   /** The message type. */
   public class MessageTypeEnum extends EnumDynamic<String, MessageTypeEnum> {
+    /** The <code>nfm_reply</code> message type. */
     public static final MessageTypeEnum NFM_REPLY = new MessageTypeEnum("nfm_reply");
 
     private static final EnumSupportDynamic<String, MessageTypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/DiscountFixedCommerce.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/DiscountFixedCommerce.java
index 58c5ad31c..8e82ed997 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/DiscountFixedCommerce.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/DiscountFixedCommerce.java
@@ -24,6 +24,7 @@ public interface DiscountFixedCommerce
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** Commerce with fixed discount */
     public static final TypeEnum FIXED_DISCOUNT_COMMERCE = new TypeEnum("FIXED_DISCOUNT_COMMERCE");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
@@ -59,9 +60,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Regular price of the product
    *
-   * <p>minimum: 0 maximum: 99999999
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 99999999 Field is required
    *
    * @return regularPrice
    */
@@ -70,9 +71,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Discounted price of the product
    *
-   * <p>minimum: 0 maximum: 99999999
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 99999999 Field is required
    *
    * @return discountPrice
    */
@@ -81,9 +82,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Fixed discount
    *
-   * <p>minimum: 0 maximum: 999999
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 999999 Field is required
    *
    * @return discountFixed
    */
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/DiscountRateCommerce.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/DiscountRateCommerce.java
index dcb5fe64e..6f26d736b 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/DiscountRateCommerce.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/DiscountRateCommerce.java
@@ -24,6 +24,7 @@ public interface DiscountRateCommerce
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** Commerce with percentage discount */
     public static final TypeEnum PERCENTAGE_DISCOUNT_COMMERCE =
         new TypeEnum("PERCENTAGE_DISCOUNT_COMMERCE");
 
@@ -60,9 +61,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Regular price of the product
    *
-   * <p>minimum: 0 maximum: 99999999
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 99999999 Field is required
    *
    * @return regularPrice
    */
@@ -71,9 +72,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Discounted price of the product
    *
-   * <p>minimum: 0 maximum: 99999999
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 99999999 Field is required
    *
    * @return discountPrice
    */
@@ -82,9 +83,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Discount rate (%)
    *
-   * <p>minimum: 0 maximum: 100
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 100 Field is required
    *
    * @return discountRate
    */
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/RegularPriceCommerce.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/RegularPriceCommerce.java
index 88505d33d..859340207 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/RegularPriceCommerce.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/commerce/RegularPriceCommerce.java
@@ -24,6 +24,7 @@ public interface RegularPriceCommerce
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** Commerce with regular price */
     public static final TypeEnum REGULAR_PRICE_COMMERCE = new TypeEnum("REGULAR_PRICE_COMMERCE");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
@@ -59,9 +60,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Regular price of the product
    *
-   * <p>minimum: 0 maximum: 99999999
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 99999999 Field is required
    *
    * @return regularPrice
    */
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/coupons/DiscountFixedCoupon.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/coupons/DiscountFixedCoupon.java
index c77b07546..369fd11e6 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/coupons/DiscountFixedCoupon.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/coupons/DiscountFixedCoupon.java
@@ -91,9 +91,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Fixed discount
    *
-   * <p>minimum: 0 maximum: 999999
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 999999 Field is required
    *
    * @return discountFixed
    */
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/coupons/DiscountRateCoupon.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/coupons/DiscountRateCoupon.java
index 1623ca6ac..563ebed74 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/coupons/DiscountRateCoupon.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/kakaotalk/coupons/DiscountRateCoupon.java
@@ -92,9 +92,9 @@ public static String valueOf(TypeEnum e) {
   /**
    * Discount rate (%)
    *
-   * <p>minimum: 0 maximum: 100
+   * <p><b>Minimum</b>: 0
    *
-   * <p>Field is required
+   * <p><b>Maximum</b>: 100 Field is required
    *
    * @return discountRate
    */
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/FlowChannelSpecificMessage.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/FlowChannelSpecificMessage.java
index d3e4e7b8f..512033b35 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/FlowChannelSpecificMessage.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/FlowChannelSpecificMessage.java
@@ -61,7 +61,10 @@ public interface FlowChannelSpecificMessage
 
   /** The mode in which the flow is. */
   public class FlowModeEnum extends EnumDynamic<String, FlowModeEnum> {
+    /** The flow is in draft mode. */
     public static final FlowModeEnum DRAFT = new FlowModeEnum("draft");
+
+    /** The flow is published. */
     public static final FlowModeEnum PUBLISHED = new FlowModeEnum("published");
 
     private static final EnumSupportDynamic<String, FlowModeEnum> ENUM_SUPPORT =
@@ -104,7 +107,10 @@ public static String valueOf(FlowModeEnum e) {
 
   /** Gets or Sets flowAction */
   public class FlowActionEnum extends EnumDynamic<String, FlowActionEnum> {
+    /** The navigate flow action. */
     public static final FlowActionEnum NAVIGATE = new FlowActionEnum("navigate");
+
+    /** The data exchange flow action. */
     public static final FlowActionEnum DATA_EXCHANGE = new FlowActionEnum("data_exchange");
 
     private static final EnumSupportDynamic<String, FlowActionEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderDocument.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderDocument.java
index f16aa24b2..88107c002 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderDocument.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderDocument.java
@@ -24,6 +24,7 @@ public interface WhatsAppInteractiveHeaderDocument
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** The document associated with the header. */
     public static final TypeEnum DOCUMENT = new TypeEnum("document");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderImage.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderImage.java
index 7d32b04de..5ce5ecdbe 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderImage.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderImage.java
@@ -24,6 +24,7 @@ public interface WhatsAppInteractiveHeaderImage
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** The image associated with the header. */
     public static final TypeEnum IMAGE = new TypeEnum("image");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderText.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderText.java
index fd8cd253d..40f3365b9 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderText.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderText.java
@@ -24,6 +24,7 @@ public interface WhatsAppInteractiveHeaderText
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** The text of the header. */
     public static final TypeEnum TEXT = new TypeEnum("text");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderVideo.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderVideo.java
index 146efe8f0..0e22dc03e 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderVideo.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/flows/WhatsAppInteractiveHeaderVideo.java
@@ -24,6 +24,7 @@ public interface WhatsAppInteractiveHeaderVideo
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** The video associated with the header. */
     public static final TypeEnum VIDEO = new TypeEnum("video");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/nfmreply/WhatsAppInteractiveNfmReply.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/nfmreply/WhatsAppInteractiveNfmReply.java
index a0d51d844..147e2a8ec 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/nfmreply/WhatsAppInteractiveNfmReply.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/nfmreply/WhatsAppInteractiveNfmReply.java
@@ -22,7 +22,10 @@ public interface WhatsAppInteractiveNfmReply {
 
   /** The nfm reply message type. */
   public class NameEnum extends EnumDynamic<String, NameEnum> {
+    /** The WhatsApp flow nfm reply message type. */
     public static final NameEnum FLOW = new NameEnum("flow");
+
+    /** The address nfm reply message type. */
     public static final NameEnum ADDRESS_MESSAGE = new NameEnum("address_message");
 
     private static final EnumSupportDynamic<String, NameEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/nfmreply/WhatsAppInteractiveNfmReplyChannelSpecificContactMessage.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/nfmreply/WhatsAppInteractiveNfmReplyChannelSpecificContactMessage.java
index 000df7a5c..68826b94a 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/nfmreply/WhatsAppInteractiveNfmReplyChannelSpecificContactMessage.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/nfmreply/WhatsAppInteractiveNfmReplyChannelSpecificContactMessage.java
@@ -25,6 +25,7 @@ public interface WhatsAppInteractiveNfmReplyChannelSpecificContactMessage
 
   /** The interactive message type. */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** The interactive nfm reply type. */
     public static final TypeEnum NFM_REPLY = new TypeEnum("nfm_reply");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPayment.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPayment.java
index eeabfc043..56158b778 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPayment.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPayment.java
@@ -23,7 +23,10 @@ public interface OrderDetailsPayment {
 
   /** The country/currency associated with the payment message. */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** Brazil */
     public static final TypeEnum BR = new TypeEnum("br");
+
+    /** Singapore */
     public static final TypeEnum SG = new TypeEnum("sg");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
@@ -66,7 +69,10 @@ public static String valueOf(TypeEnum e) {
 
   /** The type of good associated with this order. */
   public class TypeOfGoodsEnum extends EnumDynamic<String, TypeOfGoodsEnum> {
+    /** Digital goods. */
     public static final TypeOfGoodsEnum DIGITAL_GOODS = new TypeOfGoodsEnum("digital-goods");
+
+    /** Physical goods. */
     public static final TypeOfGoodsEnum PHYSICAL_GOODS = new TypeOfGoodsEnum("physical-goods");
 
     private static final EnumSupportDynamic<String, TypeOfGoodsEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonBoleto.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonBoleto.java
index ac2e3a51e..16bc54de6 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonBoleto.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonBoleto.java
@@ -24,6 +24,7 @@ public interface OrderDetailsPaymentButtonBoleto
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** The Boleto button identifier */
     public static final TypeEnum BOLETO = new TypeEnum("boleto");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonDynamicPix.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonDynamicPix.java
index fc7f0779b..f1ddb5519 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonDynamicPix.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonDynamicPix.java
@@ -24,6 +24,7 @@ public interface OrderDetailsPaymentButtonDynamicPix
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** The dynamic Pix code button identifier */
     public static final TypeEnum PIX_DYNAMIC_CODE = new TypeEnum("pix_dynamic_code");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
@@ -75,10 +76,19 @@ public static String valueOf(TypeEnum e) {
 
   /** Pix key type. */
   public class KeyTypeEnum extends EnumDynamic<String, KeyTypeEnum> {
+    /** The CPF key type. */
     public static final KeyTypeEnum CPF = new KeyTypeEnum("CPF");
+
+    /** The CNPJ key type. */
     public static final KeyTypeEnum CNPJ = new KeyTypeEnum("CNPJ");
+
+    /** The EMAIL key type. */
     public static final KeyTypeEnum EMAIL = new KeyTypeEnum("EMAIL");
+
+    /** The PHONE key type. */
     public static final KeyTypeEnum PHONE = new KeyTypeEnum("PHONE");
+
+    /** The EVP key type. */
     public static final KeyTypeEnum EVP = new KeyTypeEnum("EVP");
 
     private static final EnumSupportDynamic<String, KeyTypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonPaymentLink.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonPaymentLink.java
index 7715388b9..1d44bde44 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonPaymentLink.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderDetailsPaymentButtonPaymentLink.java
@@ -24,6 +24,7 @@ public interface OrderDetailsPaymentButtonPaymentLink
 
   /** Gets or Sets type */
   public class TypeEnum extends EnumDynamic<String, TypeEnum> {
+    /** The payment link button identifier */
     public static final TypeEnum PAYMENT_LINK = new TypeEnum("payment_link");
 
     private static final EnumSupportDynamic<String, TypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderStatusPaymentDetails.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderStatusPaymentDetails.java
index 89f11d943..24184fc3b 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderStatusPaymentDetails.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/channelspecific/whatsapp/payment/OrderStatusPaymentDetails.java
@@ -22,11 +22,22 @@ public interface OrderStatusPaymentDetails {
 
   /** The new payment message status. */
   public class StatusEnum extends EnumDynamic<String, StatusEnum> {
+    /** The order is pending. */
     public static final StatusEnum PENDING = new StatusEnum("pending");
+
+    /** The order is processing. */
     public static final StatusEnum PROCESSING = new StatusEnum("processing");
+
+    /** A portion of the order has been shipped. */
     public static final StatusEnum PARTIALLY_SHIPPED = new StatusEnum("partially-shipped");
+
+    /** The order has been shipped. */
     public static final StatusEnum SHIPPED = new StatusEnum("shipped");
+
+    /** The order is complete. */
     public static final StatusEnum COMPLETED = new StatusEnum("completed");
+
+    /** The order was canceled. */
     public static final StatusEnum CANCELED = new StatusEnum("canceled");
 
     private static final EnumSupportDynamic<String, StatusEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/internal/ChannelSpecificContactMessageMessageInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/internal/ChannelSpecificContactMessageMessageInternal.java
index a69f9a605..96c86d4a0 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/internal/ChannelSpecificContactMessageMessageInternal.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/internal/ChannelSpecificContactMessageMessageInternal.java
@@ -23,6 +23,7 @@ public interface ChannelSpecificContactMessageMessageInternal {
 
   /** The message type. */
   public class MessageTypeEnum extends EnumDynamic<String, MessageTypeEnum> {
+    /** The <code>nfm_reply</code> message type. */
     public static final MessageTypeEnum NFM_REPLY = new MessageTypeEnum("nfm_reply");
 
     private static final EnumSupportDynamic<String, MessageTypeEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotification.java
index 776831862..fc7586868 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotification.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/capability/CapabilityEventNotification.java
@@ -53,12 +53,22 @@ public interface CapabilityEventNotification {
 
   /** Status indicating the recipient's capability on the channel. */
   public class CapabilityStatusEnum extends EnumDynamic<String, CapabilityStatusEnum> {
+    /**
+     * The channel capability for the contact is unknown due to the underlying channel not making
+     * this information available.
+     */
     public static final CapabilityStatusEnum CAPABILITY_UNKNOWN =
         new CapabilityStatusEnum("CAPABILITY_UNKNOWN");
+
+    /** The specified contact supports all the features of the channel. */
     public static final CapabilityStatusEnum CAPABILITY_FULL =
         new CapabilityStatusEnum("CAPABILITY_FULL");
+
+    /** The specified contact supports a subset of the channel features. */
     public static final CapabilityStatusEnum CAPABILITY_PARTIAL =
         new CapabilityStatusEnum("CAPABILITY_PARTIAL");
+
+    /** The specified contact has no capability on the channel. */
     public static final CapabilityStatusEnum NO_CAPABILITY =
         new CapabilityStatusEnum("NO_CAPABILITY");
 
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/Event.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/Event.java
index 3b18fbeaa..8cbcfa488 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/Event.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/inbound/Event.java
@@ -34,6 +34,7 @@ public interface Event {
 
   /** The direction of the event. It's always TO_APP for contact events. */
   public class DirectionEnum extends EnumDynamic<String, DirectionEnum> {
+    /** An event sent to a Conversation API app. */
     public static final DirectionEnum TO_APP = new DirectionEnum("TO_APP");
 
     private static final EnumSupportDynamic<String, DirectionEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessage.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessage.java
index dbde95e7a..b77e79ffc 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessage.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/message/MessageInboundEventMessage.java
@@ -33,6 +33,7 @@ public interface MessageInboundEventMessage {
 
   /** The direction of the message, it's always TO_APP for contact messages. */
   public class DirectionEnum extends EnumDynamic<String, DirectionEnum> {
+    /** A message sent to a Conversation API app. */
     public static final DirectionEnum TO_APP = new DirectionEnum("TO_APP");
 
     private static final EnumSupportDynamic<String, DirectionEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotification.java
index a481ea38e..75ef533ce 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotification.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptInEventNotification.java
@@ -53,8 +53,13 @@ public interface OptInEventNotification {
 
   /** Status of the opt-in registration. */
   public class StatusEnum extends EnumDynamic<String, StatusEnum> {
+    /** The opt-in registration succeeded. */
     public static final StatusEnum OPT_IN_SUCCEEDED = new StatusEnum("OPT_IN_SUCCEEDED");
+
+    /** The opt-in registration failed. */
     public static final StatusEnum OPT_IN_FAILED = new StatusEnum("OPT_IN_FAILED");
+
+    /** The status of the opt-in registration is unknown. */
     public static final StatusEnum OPT_IN_STATUS_UNSPECIFIED =
         new StatusEnum("OPT_IN_STATUS_UNSPECIFIED");
 
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotification.java
index 79bc483b7..ba9d7a6ec 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotification.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/opting/OptOutEventNotification.java
@@ -53,8 +53,13 @@ public interface OptOutEventNotification {
 
   /** Status of the opt-out registration. */
   public class StatusEnum extends EnumDynamic<String, StatusEnum> {
+    /** The opt-out registration succeeded. */
     public static final StatusEnum OPT_OUT_SUCCEEDED = new StatusEnum("OPT_OUT_SUCCEEDED");
+
+    /** The opt-out registration failed. */
     public static final StatusEnum OPT_OUT_FAILED = new StatusEnum("OPT_OUT_FAILED");
+
+    /** The status of the opt-out registration is unknown. */
     public static final StatusEnum OPT_OUT_STATUS_UNSPECIFIED =
         new StatusEnum("OPT_OUT_STATUS_UNSPECIFIED");
 
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotification.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotification.java
index 77082f361..1431af2bb 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotification.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/record/RecordNotificationEventNotification.java
@@ -32,8 +32,11 @@ public interface RecordNotificationEventNotification {
 
   /** Record status for a specific entity */
   public class RecordStatusEnum extends EnumDynamic<String, RecordStatusEnum> {
+    /** The record status is unknown. */
     public static final RecordStatusEnum RECORD_STATUS_UNSPECIFIED =
         new RecordStatusEnum("RECORD_STATUS_UNSPECIFIED");
+
+    /** The record for the entity has been stored. */
     public static final RecordStatusEnum EVENT_RECORD_STORED =
         new RecordStatusEnum("EVENT_RECORD_STORED");
 
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysis.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysis.java
index b61eaebbf..4296ee165 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysis.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/sinchevents/smartconversations/OffensiveAnalysis.java
@@ -36,7 +36,10 @@ public interface OffensiveAnalysis {
 
   /** A label, either SAFE or UNSAFE, that classifies the analyzed content. */
   public class EvaluationEnum extends EnumDynamic<String, EvaluationEnum> {
+    /** The analysis of the content indicates that it is most likely safe. */
     public static final EvaluationEnum SAFE = new EvaluationEnum("SAFE");
+
+    /** The analysis of the content indicates that it is most likely unsafe. */
     public static final EvaluationEnum UNSAFE = new EvaluationEnum("UNSAFE");
 
     private static final EnumSupportDynamic<String, EvaluationEnum> ENUM_SUPPORT =
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/TemplatesV2Service.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/TemplatesV2Service.java
index ca3d93423..517af4e12 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/TemplatesV2Service.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/TemplatesV2Service.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/adapters/TemplatesV2ServiceImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/adapters/TemplatesV2ServiceImpl.java
index ca1abf239..edbced9c9 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/adapters/TemplatesV2ServiceImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/api/v2/adapters/TemplatesV2ServiceImpl.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/TemplateVariable.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/TemplateVariable.java
index 246c856c7..dc2e53366 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/TemplateVariable.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/TemplateVariable.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/ChannelTemplateOverride.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/ChannelTemplateOverride.java
index bbe5d4159..32ee28835 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/ChannelTemplateOverride.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/ChannelTemplateOverride.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationBase.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationBase.java
index fef52a013..e2f9894bb 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationBase.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationBase.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -58,6 +58,7 @@ public interface TemplateTranslationBase {
    * Timestamp when the translation was created.
    *
    * @return createTime
+   * @readOnly <em>This field is returned by the server and cannot be modified</em>
    */
   Instant getCreateTime();
 
@@ -65,6 +66,7 @@ public interface TemplateTranslationBase {
    * Timestamp of when the translation was updated.
    *
    * @return updateTime
+   * @readOnly <em>This field is returned by the server and cannot be modified</em>
    */
   Instant getUpdateTime();
 
@@ -114,6 +116,7 @@ B setChannelTemplateOverrides(
      * @param createTime see getter
      * @return Current builder
      * @see #getCreateTime
+     * @readOnly <em>This field is returned by the server and cannot be modified</em>
      */
     B setCreateTime(Instant createTime);
 
@@ -123,6 +126,7 @@ B setChannelTemplateOverrides(
      * @param updateTime see getter
      * @return Current builder
      * @see #getUpdateTime
+     * @readOnly <em>This field is returned by the server and cannot be modified</em>
      */
     B setUpdateTime(Instant updateTime);
 
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationBaseImpl.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationBaseImpl.java
index 66be0479c..0414e2b14 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationBaseImpl.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationBaseImpl.java
@@ -191,8 +191,7 @@ public Instant getCreateTime() {
     return createTime.orElse(null);
   }
 
-  @JsonProperty(JSON_PROPERTY_CREATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JsonIgnore
   public OptionalValue<Instant> createTime() {
     return createTime;
   }
@@ -202,8 +201,7 @@ public Instant getUpdateTime() {
     return updateTime.orElse(null);
   }
 
-  @JsonProperty(JSON_PROPERTY_UPDATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JsonIgnore
   public OptionalValue<Instant> updateTime() {
     return updateTime;
   }
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateV2.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateV2.java
index 12fa3721b..a69a20e70 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateV2.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateV2.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/internal/ListTemplatesResponseInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/internal/ListTemplatesResponseInternal.java
index dc718b171..e1f5bbcac 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/internal/ListTemplatesResponseInternal.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/internal/ListTemplatesResponseInternal.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/internal/ListTranslationsResponseInternal.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/internal/ListTranslationsResponseInternal.java
index e8cbab1c2..0e7697ca9 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/internal/ListTranslationsResponseInternal.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/internal/ListTranslationsResponseInternal.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/request/ListTranslationsQueryParameters.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/request/ListTranslationsQueryParameters.java
index 6d387dda1..3e8e59b26 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/request/ListTranslationsQueryParameters.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/request/ListTranslationsQueryParameters.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponse.java
index 035f9badc..47727daa6 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponse.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponse.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponse.java b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponse.java
index b037b030b..e7bf1f618 100644
--- a/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponse.java
+++ b/openapi-contracts/src/main/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponse.java
@@ -1,7 +1,7 @@
 /*
  * Template Management API
  *
- * OpenAPI document version: 1.0
+ * OpenAPI document version: 2.0
  * Contact: support@sinch.com
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationDtoTest.java
index b993ba5d5..eefd2c69b 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateTranslationDtoTest.java
@@ -18,7 +18,19 @@
 @TestWithResources
 public class TemplateTranslationDtoTest extends TemplatesBaseTest {
 
-  public static TemplateTranslation expectedDto =
+  public static TemplateTranslation expectedRequestDto =
+      TemplateTranslation.builder()
+          .setMessage(TemplateMessageDtoTest.templateMessageDto)
+          .setLanguageCode("fr-FR")
+          .setVersion("1")
+          .setChannelTemplateOverrides(
+              Collections.singletonMap(
+                  ConversationChannel.KAKAOTALK,
+                  ChannelTemplateOverrideDtoTest.expectedWithVersionDto))
+          .setVariables(Arrays.asList(TemplateVariableDtoTest.expectedDto))
+          .build();
+
+  public static TemplateTranslation expectedResponseDto =
       TemplateTranslation.builder()
           .setMessage(TemplateMessageDtoTest.templateMessageDto)
           .setLanguageCode("fr-FR")
@@ -32,20 +44,25 @@ public class TemplateTranslationDtoTest extends TemplatesBaseTest {
           .setUpdateTime(Instant.parse("2024-07-07T06:07:44Z"))
           .build();
 
-  @GivenTextResource("/domains/conversation/templates/v2/TemplateTranslationDto.json")
-  String json;
+  @GivenTextResource(
+      "/domains/conversation/templates/v2/request/TemplateTranslationV2RequestDto.json")
+  String jsonRequest;
+
+  @GivenTextResource(
+      "/domains/conversation/templates/v2/response/TemplateTranslationV2ResponseDto.json")
+  String jsonResponse;
 
   @Test
   void serialize() throws JsonProcessingException, JSONException {
-    String serializedString = objectMapper.writeValueAsString(expectedDto);
+    String serializedString = objectMapper.writeValueAsString(expectedRequestDto);
 
-    JSONAssert.assertEquals(json, serializedString, true);
+    JSONAssert.assertEquals(jsonRequest, serializedString, true);
   }
 
   @Test
   void deserialize() throws JsonProcessingException {
-    Object deserialized = objectMapper.readValue(json, TemplateTranslation.class);
+    Object deserialized = objectMapper.readValue(jsonResponse, TemplateTranslation.class);
 
-    TestHelpers.recursiveEquals(deserialized, expectedDto);
+    TestHelpers.recursiveEquals(deserialized, expectedResponseDto);
   }
 }
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateV2DtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateV2DtoTest.java
index 88fb8800e..e552014c3 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateV2DtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/TemplateV2DtoTest.java
@@ -17,13 +17,22 @@ public class TemplateV2DtoTest extends TemplatesBaseTest {
   @GivenTextResource("/domains/conversation/templates/v2/request/TemplateV2RequestDto.json")
   String requestJSON;
 
-  @GivenTextResource("/domains/conversation/templates/v2/TemplateV2Dto.json")
-  String responseSON;
+  @GivenTextResource("/domains/conversation/templates/v2/response/TemplateV2ResponseDto.json")
+  String responseJSON;
 
-  public static TemplateV2 expectedDto =
+  public static TemplateV2 expectedRequestDto =
       TemplateV2.builder()
           .setId("template ID")
-          .setTranslations(Arrays.asList(TemplateTranslationDtoTest.expectedDto))
+          .setTranslations(Arrays.asList(TemplateTranslationDtoTest.expectedRequestDto))
+          .setDefaultTranslation("fr-FR")
+          .setDescription("template description value")
+          .setVersion(1)
+          .build();
+
+  public static TemplateV2 expectedResponseDto =
+      TemplateV2.builder()
+          .setId("template ID")
+          .setTranslations(Arrays.asList(TemplateTranslationDtoTest.expectedResponseDto))
           .setDefaultTranslation("fr-FR")
           .setDescription("template description value")
           .setVersion(1)
@@ -33,15 +42,15 @@ public class TemplateV2DtoTest extends TemplatesBaseTest {
 
   @Test
   void serialize() throws JsonProcessingException, JSONException {
-    String serializedString = objectMapper.writeValueAsString(expectedDto);
+    String serializedString = objectMapper.writeValueAsString(expectedRequestDto);
 
     JSONAssert.assertEquals(requestJSON, serializedString, true);
   }
 
   @Test
   void deserialize() throws JsonProcessingException {
-    Object deserialized = objectMapper.readValue(responseSON, TemplateV2.class);
+    Object deserialized = objectMapper.readValue(responseJSON, TemplateV2.class);
 
-    TestHelpers.recursiveEquals(deserialized, expectedDto);
+    TestHelpers.recursiveEquals(deserialized, expectedResponseDto);
   }
 }
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponseDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponseDtoTest.java
index 13f169c23..0f8b93aa9 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponseDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/response/TemplatesV2ListResponseDtoTest.java
@@ -15,7 +15,7 @@ public class TemplatesV2ListResponseDtoTest extends TemplatesBaseTest {
 
   public static ListTemplatesResponseInternal expectedDto =
       ListTemplatesResponseInternal.builder()
-          .setTemplates(Arrays.asList(TemplateV2DtoTest.expectedDto))
+          .setTemplates(Arrays.asList(TemplateV2DtoTest.expectedResponseDto))
           .build();
 
   @GivenTextResource("/domains/conversation/templates/v2/response/TemplatesV2ListResponseDto.json")
diff --git a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponseDtoTest.java b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponseDtoTest.java
index d9d17bf74..5890dc13a 100644
--- a/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponseDtoTest.java
+++ b/openapi-contracts/src/test/java/com/sinch/sdk/domains/conversation/templates/models/v2/response/TranslationsV2ListResponseDtoTest.java
@@ -8,29 +8,20 @@
 import com.sinch.sdk.domains.conversation.templates.models.v2.TemplateTranslationDtoTest;
 import com.sinch.sdk.domains.conversation.templates.models.v2.internal.ListTranslationsResponseInternal;
 import java.util.Arrays;
-import org.json.JSONException;
 import org.junit.jupiter.api.Test;
-import org.skyscreamer.jsonassert.JSONAssert;
 
 @TestWithResources
 public class TranslationsV2ListResponseDtoTest extends TemplatesBaseTest {
 
   public static ListTranslationsResponseInternal expectedDto =
       ListTranslationsResponseInternal.builder()
-          .setTranslations(Arrays.asList(TemplateTranslationDtoTest.expectedDto))
+          .setTranslations(Arrays.asList(TemplateTranslationDtoTest.expectedResponseDto))
           .build();
 
   @GivenTextResource(
       "/domains/conversation/templates/v2/response/TranslationsV2ListResponseDto.json")
   String json;
 
-  @Test
-  void serialize() throws JsonProcessingException, JSONException {
-    String serializedString = objectMapper.writeValueAsString(expectedDto);
-
-    JSONAssert.assertEquals(json, serializedString, true);
-  }
-
   @Test
   void deserialize() throws JsonProcessingException {
     Object deserialized = objectMapper.readValue(json, ListTranslationsResponseInternal.class);
diff --git a/openapi-contracts/src/test/resources/domains/conversation/templates/v2/request/TemplateTranslationV2RequestDto.json b/openapi-contracts/src/test/resources/domains/conversation/templates/v2/request/TemplateTranslationV2RequestDto.json
new file mode 100644
index 000000000..fdf376264
--- /dev/null
+++ b/openapi-contracts/src/test/resources/domains/conversation/templates/v2/request/TemplateTranslationV2RequestDto.json
@@ -0,0 +1,42 @@
+{
+  "language_code": "fr-FR",
+  "version": "1",
+  "channel_template_overrides": {
+    "KAKAOTALK": {
+        "template_reference": {
+          "language_code": "another language",
+          "parameters": {
+            "name": "Value for the name parameter used in the version 1 and language \"en-US\" of the template"
+          },
+          "template_id": "another template ID",
+          "version": "another version"
+      },
+      "parameter_mappings": {
+        "a key": "a value"
+      }
+    }
+  },
+  "variables": [
+    {
+      "key": "key value",
+      "preview_value": "preview value"
+    }
+  ],
+  "template_message": {
+    "channel_template": {
+      "KAKAOTALK": {
+        "language_code": "en-US",
+        "template_id": "my template ID value",
+        "version": "a version"
+      }
+    },
+    "omni_template": {
+      "language_code": "another language",
+      "parameters": {
+        "name": "Value for the name parameter used in the version 1 and language \"en-US\" of the template"
+      },
+      "template_id": "another template ID",
+      "version": "another version"
+    }
+  }
+}
diff --git a/openapi-contracts/src/test/resources/domains/conversation/templates/v2/request/TemplateV2RequestDto.json b/openapi-contracts/src/test/resources/domains/conversation/templates/v2/request/TemplateV2RequestDto.json
index f7628b229..a0d268849 100644
--- a/openapi-contracts/src/test/resources/domains/conversation/templates/v2/request/TemplateV2RequestDto.json
+++ b/openapi-contracts/src/test/resources/domains/conversation/templates/v2/request/TemplateV2RequestDto.json
@@ -28,8 +28,6 @@
           "preview_value": "preview value"
         }
       ],
-      "create_time": "2024-07-07T02:59:59Z",
-      "update_time": "2024-07-07T06:07:44Z",
       "template_message": {
         "channel_template": {
           "KAKAOTALK": {
diff --git a/openapi-contracts/src/test/resources/domains/conversation/templates/v2/TemplateTranslationDto.json b/openapi-contracts/src/test/resources/domains/conversation/templates/v2/response/TemplateTranslationV2ResponseDto.json
similarity index 100%
rename from openapi-contracts/src/test/resources/domains/conversation/templates/v2/TemplateTranslationDto.json
rename to openapi-contracts/src/test/resources/domains/conversation/templates/v2/response/TemplateTranslationV2ResponseDto.json
diff --git a/openapi-contracts/src/test/resources/domains/conversation/templates/v2/TemplateV2Dto.json b/openapi-contracts/src/test/resources/domains/conversation/templates/v2/response/TemplateV2ResponseDto.json
similarity index 100%
rename from openapi-contracts/src/test/resources/domains/conversation/templates/v2/TemplateV2Dto.json
rename to openapi-contracts/src/test/resources/domains/conversation/templates/v2/response/TemplateV2ResponseDto.json
diff --git a/openapi-contracts/src/test/resources/domains/conversation/templates/v2/response/TemplatesV2ListResponseDto.json b/openapi-contracts/src/test/resources/domains/conversation/templates/v2/response/TemplatesV2ListResponseDto.json
index 035e34d34..36ee0d6cd 100644
--- a/openapi-contracts/src/test/resources/domains/conversation/templates/v2/response/TemplatesV2ListResponseDto.json
+++ b/openapi-contracts/src/test/resources/domains/conversation/templates/v2/response/TemplatesV2ListResponseDto.json
@@ -5,6 +5,8 @@
       "description": "template description value",
       "version": 1,
       "default_translation": "fr-FR",
+      "create_time": "2024-08-26T06:00:00Z",
+      "update_time": "2024-08-26T06:07:44Z",
       "translations": [
         {
           "language_code": "fr-FR",
@@ -50,9 +52,7 @@
             }
           }
         }
-      ],
-      "create_time": "2024-08-26T06:00:00Z",
-      "update_time": "2024-08-26T06:07:44Z"
+      ]
     }
   ]
 }