diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentConversationContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentConversationContent.java
index f0610e82..ee6c2194 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentConversationContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentConversationContent.java
@@ -30,7 +30,7 @@ public class AttachmentConversationContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "AttachmentConversationContent";
+  private static final String OBJECT_TYPE_GET = "AttachmentConversationContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, Integer chatConversationId, Integer attachmentId) {
     return list(apiContext, userId, chatConversationId, attachmentId, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentMonetaryAccount.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentMonetaryAccount.java
index 24cc9f11..e1e130be 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentMonetaryAccount.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentMonetaryAccount.java
@@ -28,11 +28,6 @@ public class AttachmentMonetaryAccount extends BunqModel {
    */
   private static final String ENDPOINT_URL_CREATE = "user/%s/monetary-account/%s/attachment";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "AttachmentMonetaryAccount";
-
   /**
    * The attachment.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublic.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublic.java
index 4e6711e3..e417d08d 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublic.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublic.java
@@ -32,7 +32,8 @@ public class AttachmentPublic extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "AttachmentPublic";
+  private static final String OBJECT_TYPE_POST = "Uuid";
+  private static final String OBJECT_TYPE_GET = "AttachmentPublic";
 
   /**
    * The UUID of the attachment.
@@ -91,7 +92,7 @@ public static BunqResponse<AttachmentPublic> get(ApiContext apiContext, String a
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, attachmentPublicUuid), new HashMap<>(), customHeaders);
 
-    return fromJson(AttachmentPublic.class, responseRaw, OBJECT_TYPE);
+    return fromJson(AttachmentPublic.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublicContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublicContent.java
index 84787b68..dd456219 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublicContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentPublicContent.java
@@ -30,7 +30,7 @@ public class AttachmentPublicContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "AttachmentPublicContent";
+  private static final String OBJECT_TYPE_GET = "AttachmentPublicContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, String attachmentPublicUuid) {
     return list(apiContext, attachmentPublicUuid, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTab.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTab.java
index 60fcf7ad..51088533 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTab.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTab.java
@@ -33,7 +33,7 @@ public class AttachmentTab extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "AttachmentTab";
+  private static final String OBJECT_TYPE_GET = "AttachmentTab";
 
   /**
    * The id of the attachment.
@@ -93,7 +93,7 @@ public static BunqResponse<AttachmentTab> get(ApiContext apiContext, Integer use
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, attachmentTabId), new HashMap<>(), customHeaders);
 
-    return fromJson(AttachmentTab.class, responseRaw, OBJECT_TYPE);
+    return fromJson(AttachmentTab.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTabContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTabContent.java
index 0cb41c3c..8079a998 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTabContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/AttachmentTabContent.java
@@ -30,7 +30,7 @@ public class AttachmentTabContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "AttachmentTabContent";
+  private static final String OBJECT_TYPE_GET = "AttachmentTabContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer attachmentTabId) {
     return list(apiContext, userId, monetaryAccountId, attachmentTabId, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Avatar.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Avatar.java
index fc74d22b..5f3dfd6d 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Avatar.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Avatar.java
@@ -40,7 +40,8 @@ public class Avatar extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Avatar";
+  private static final String OBJECT_TYPE_POST = "Uuid";
+  private static final String OBJECT_TYPE_GET = "Avatar";
 
   /**
    * The UUID of the created avatar.
@@ -80,7 +81,7 @@ public static BunqResponse<Avatar> get(ApiContext apiContext, String avatarUuid,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, avatarUuid), new HashMap<>(), customHeaders);
 
-    return fromJson(Avatar.class, responseRaw, OBJECT_TYPE);
+    return fromJson(Avatar.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/BillingContractSubscription.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/BillingContractSubscription.java
index 059eb783..fc27161a 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/BillingContractSubscription.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/BillingContractSubscription.java
@@ -35,7 +35,7 @@ public class BillingContractSubscription extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "BillingContractSubscription";
+  private static final String OBJECT_TYPE_GET = "BillingContractSubscription";
 
   /**
    * The id of the billing contract.
@@ -87,18 +87,18 @@ public class BillingContractSubscription extends BunqModel {
   @SerializedName("subscription_type")
   private String subscriptionType;
 
-  public static BunqResponse<BillingContractSubscription> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId) {
+  public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId) {
     return create(apiContext, requestMap, userId, new HashMap<>());
   }
 
   /**
    */
-  public static BunqResponse<BillingContractSubscription> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, userId), requestBytes, customHeaders);
 
-    return fromJson(BillingContractSubscription.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<BillingContractSubscription>> list(ApiContext apiContext, Integer userId) {
@@ -116,7 +116,7 @@ public static BunqResponse<List<BillingContractSubscription>> list(ApiContext ap
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(BillingContractSubscription.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(BillingContractSubscription.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeFundraiserProfile.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeFundraiserProfile.java
index cfbb1bf1..82e8aba0 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeFundraiserProfile.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeFundraiserProfile.java
@@ -24,11 +24,6 @@ public class BunqMeFundraiserProfile extends BunqModel {
    */
   public static final String FIELD_POINTER = "pointer";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "BunqMeFundraiserProfileModel";
-
   /**
    * The color chosen for the bunq.me fundraiser profile in hexadecimal format.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeFundraiserResult.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeFundraiserResult.java
index 62495a44..c3e16df9 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeFundraiserResult.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeFundraiserResult.java
@@ -16,11 +16,6 @@
  */
 public class BunqMeFundraiserResult extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "BunqMeFundraiserResult";
-
   /**
    * The id of the bunq.me.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTab.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTab.java
index 2ce95c98..8d3733e7 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTab.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTab.java
@@ -40,7 +40,7 @@ public class BunqMeTab extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "BunqMeTab";
+  private static final String OBJECT_TYPE_GET = "BunqMeTab";
 
   /**
    * The id of the created bunq.me.
@@ -119,18 +119,18 @@ public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Ob
     return processForId(responseRaw);
   }
 
-  public static BunqResponse<BunqMeTab> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer bunqMeTabId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer bunqMeTabId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, bunqMeTabId, new HashMap<>());
   }
 
   /**
    */
-  public static BunqResponse<BunqMeTab> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer bunqMeTabId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer bunqMeTabId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, bunqMeTabId), requestBytes, customHeaders);
 
-    return fromJson(BunqMeTab.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<BunqMeTab>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -147,7 +147,7 @@ public static BunqResponse<List<BunqMeTab>> list(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(BunqMeTab.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(BunqMeTab.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<BunqMeTab> get(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer bunqMeTabId) {
@@ -160,7 +160,7 @@ public static BunqResponse<BunqMeTab> get(ApiContext apiContext, Integer userId,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, bunqMeTabId), new HashMap<>(), customHeaders);
 
-    return fromJson(BunqMeTab.class, responseRaw, OBJECT_TYPE);
+    return fromJson(BunqMeTab.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabEntry.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabEntry.java
index 3bff3db4..27aa6c5e 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabEntry.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabEntry.java
@@ -28,11 +28,6 @@ public class BunqMeTabEntry extends BunqModel {
   public static final String FIELD_DESCRIPTION = "description";
   public static final String FIELD_REDIRECT_URL = "redirect_url";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "BunqMeTab";
-
   /**
    * The uuid of the bunq.me.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabResultInquiry.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabResultInquiry.java
index 7ccfa9fd..4eef33a7 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabResultInquiry.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabResultInquiry.java
@@ -17,11 +17,6 @@
  */
 public class BunqMeTabResultInquiry extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "BunqMeTabResultInquiry";
-
   /**
    * The payment made for the Tab.
    */
@@ -29,6 +24,13 @@ public class BunqMeTabResultInquiry extends BunqModel {
   @SerializedName("payment")
   private Payment payment;
 
+  /**
+   * The Id of the bunq.me tab that this BunqMeTabResultInquiry belongs to.
+   */
+  @Expose
+  @SerializedName("bunq_me_tab_id")
+  private Integer bunqMeTabId;
+
   /**
    * The payment made for the Tab.
    */
@@ -40,6 +42,17 @@ public void setPayment(Payment payment) {
     this.payment = payment;
   }
 
+  /**
+   * The Id of the bunq.me tab that this BunqMeTabResultInquiry belongs to.
+   */
+  public Integer getBunqMeTabId() {
+    return this.bunqMeTabId;
+  }
+
+  public void setBunqMeTabId(Integer bunqMeTabId) {
+    this.bunqMeTabId = bunqMeTabId;
+  }
+
   /**
    */
   public boolean isAllFieldNull() {
@@ -47,6 +60,10 @@ public boolean isAllFieldNull() {
       return false;
     }
 
+    if (this.bunqMeTabId != null) {
+      return false;
+    }
+
     return true;
   }
 
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabResultResponse.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabResultResponse.java
index fa7b339e..e3198942 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabResultResponse.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/BunqMeTabResultResponse.java
@@ -17,11 +17,6 @@
  */
 public class BunqMeTabResultResponse extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "BunqMeTabResultResponse";
-
   /**
    * The payment made for the bunq.me tab.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Card.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Card.java
index 4552a71b..6bc2e9d7 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Card.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Card.java
@@ -50,7 +50,7 @@ public class Card extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CardDebit";
+  private static final String OBJECT_TYPE_GET = "CardDebit";
 
   /**
    * The id of the card.
@@ -203,7 +203,7 @@ public class Card extends BunqModel {
   @SerializedName("country")
   private String country;
 
-  public static BunqResponse<Card> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId) {
     return update(apiContext, requestMap, userId, cardId, new HashMap<>());
   }
 
@@ -212,13 +212,13 @@ public static BunqResponse<Card> update(ApiContext apiContext, Map<String, Objec
    * the monetary account connected to the card. When the card has been received, it can be also
    * activated through this endpoint.
    */
-  public static BunqResponse<Card> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     requestBytes = SecurityUtils.encrypt(apiContext, requestBytes, customHeaders);
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, cardId), requestBytes, customHeaders);
 
-    return fromJson(Card.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<Card> get(ApiContext apiContext, Integer userId, Integer cardId) {
@@ -232,7 +232,7 @@ public static BunqResponse<Card> get(ApiContext apiContext, Integer userId, Inte
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, cardId), new HashMap<>(), customHeaders);
 
-    return fromJson(Card.class, responseRaw, OBJECT_TYPE);
+    return fromJson(Card.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<Card>> list(ApiContext apiContext, Integer userId) {
@@ -250,7 +250,7 @@ public static BunqResponse<List<Card>> list(ApiContext apiContext, Integer userI
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(Card.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(Card.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardDebit.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardDebit.java
index e78d632d..444c27d0 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardDebit.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardDebit.java
@@ -48,7 +48,7 @@ public class CardDebit extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CardDebit";
+  private static final String OBJECT_TYPE_POST = "CardDebit";
 
   /**
    * The id of the card.
@@ -204,7 +204,7 @@ public static BunqResponse<CardDebit> create(ApiContext apiContext, Map<String,
     requestBytes = SecurityUtils.encrypt(apiContext, requestBytes, customHeaders);
     BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, userId), requestBytes, customHeaders);
 
-    return fromJson(CardDebit.class, responseRaw, OBJECT_TYPE);
+    return fromJson(CardDebit.class, responseRaw, OBJECT_TYPE_POST);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardGeneratedCvc2.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardGeneratedCvc2.java
index fed756f4..335b91f4 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardGeneratedCvc2.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardGeneratedCvc2.java
@@ -32,7 +32,7 @@ public class CardGeneratedCvc2 extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CardGeneratedCvc2";
+  private static final String OBJECT_TYPE_GET = "CardGeneratedCvc2";
 
   /**
    * The id of the cvc code.
@@ -76,20 +76,20 @@ public class CardGeneratedCvc2 extends BunqModel {
   @SerializedName("expiry_time")
   private String expiryTime;
 
-  public static BunqResponse<CardGeneratedCvc2> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId) {
+  public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId) {
     return create(apiContext, requestMap, userId, cardId, new HashMap<>());
   }
 
   /**
    * Generate a new CVC2 code for a card.
    */
-  public static BunqResponse<CardGeneratedCvc2> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer cardId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     requestBytes = SecurityUtils.encrypt(apiContext, requestBytes, customHeaders);
     BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, userId, cardId), requestBytes, customHeaders);
 
-    return fromJson(CardGeneratedCvc2.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<CardGeneratedCvc2> get(ApiContext apiContext, Integer userId, Integer cardId, Integer cardGeneratedCvc2Id) {
@@ -103,7 +103,7 @@ public static BunqResponse<CardGeneratedCvc2> get(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, cardId, cardGeneratedCvc2Id), new HashMap<>(), customHeaders);
 
-    return fromJson(CardGeneratedCvc2.class, responseRaw, OBJECT_TYPE);
+    return fromJson(CardGeneratedCvc2.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<CardGeneratedCvc2>> list(ApiContext apiContext, Integer userId, Integer cardId) {
@@ -121,7 +121,7 @@ public static BunqResponse<List<CardGeneratedCvc2>> list(ApiContext apiContext,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, cardId), params, customHeaders);
 
-    return fromJsonList(CardGeneratedCvc2.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CardGeneratedCvc2.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardName.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardName.java
index a478836b..52a4613d 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardName.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardName.java
@@ -31,7 +31,7 @@ public class CardName extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CardUserNameArray";
+  private static final String OBJECT_TYPE_GET = "CardUserNameArray";
 
   /**
    * All possible variations (of suitable length) of user's legal name for the debit card.
@@ -55,7 +55,7 @@ public static BunqResponse<List<CardName>> list(ApiContext apiContext, Integer u
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(CardName.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CardName.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardPinChange.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardPinChange.java
index 873af2c7..fc298ab0 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardPinChange.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardPinChange.java
@@ -32,7 +32,7 @@ public class CardPinChange extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CardPinChange";
+  private static final String OBJECT_TYPE_GET = "CardPinChange";
 
   /**
    * The id of the pin change.
@@ -90,7 +90,7 @@ public static BunqResponse<List<CardPinChange>> list(ApiContext apiContext, Inte
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, cardId), params, customHeaders);
 
-    return fromJsonList(CardPinChange.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CardPinChange.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<CardPinChange> get(ApiContext apiContext, Integer userId, Integer cardId, Integer cardPinChangeId) {
@@ -103,7 +103,7 @@ public static BunqResponse<CardPinChange> get(ApiContext apiContext, Integer use
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, cardId, cardPinChangeId), new HashMap<>(), customHeaders);
 
-    return fromJson(CardPinChange.class, responseRaw, OBJECT_TYPE);
+    return fromJson(CardPinChange.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardReplace.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardReplace.java
index 99a3ccbf..1810d3b3 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardReplace.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardReplace.java
@@ -37,11 +37,6 @@ public class CardReplace extends BunqModel {
   public static final String FIELD_PIN_CODE = "pin_code";
   public static final String FIELD_SECOND_LINE = "second_line";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "CardReplace";
-
   /**
    * The id of the new card.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardResult.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardResult.java
index c13c707c..f1ed3849 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CardResult.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CardResult.java
@@ -33,7 +33,7 @@ public class CardResult extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CardResult";
+  private static final String OBJECT_TYPE_GET = "CardResult";
 
   /**
    * The id of the monetary account this card result links to.
@@ -157,7 +157,7 @@ public static BunqResponse<CardResult> get(ApiContext apiContext, Integer userId
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, cardResultId), new HashMap<>(), customHeaders);
 
-    return fromJson(CardResult.class, responseRaw, OBJECT_TYPE);
+    return fromJson(CardResult.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<CardResult>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -174,7 +174,7 @@ public static BunqResponse<List<CardResult>> list(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(CardResult.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CardResult.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegister.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegister.java
index 3bbbf40f..1d6850be 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegister.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegister.java
@@ -51,7 +51,7 @@ public class CashRegister extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CashRegister";
+  private static final String OBJECT_TYPE_GET = "CashRegister";
 
   /**
    * The id of the created CashRegister.
@@ -146,7 +146,7 @@ public static BunqResponse<CashRegister> get(ApiContext apiContext, Integer user
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, cashRegisterId), new HashMap<>(), customHeaders);
 
-    return fromJson(CashRegister.class, responseRaw, OBJECT_TYPE);
+    return fromJson(CashRegister.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer cashRegisterId) {
@@ -181,7 +181,7 @@ public static BunqResponse<List<CashRegister>> list(ApiContext apiContext, Integ
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(CashRegister.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CashRegister.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCode.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCode.java
index 62b8572c..400013f6 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCode.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCode.java
@@ -39,7 +39,7 @@ public class CashRegisterQrCode extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TokenQrCashRegister";
+  private static final String OBJECT_TYPE_GET = "TokenQrCashRegister";
 
   /**
    * The id of the created QR code. Use this id to get the RAW content of the QR code with:
@@ -130,7 +130,7 @@ public static BunqResponse<CashRegisterQrCode> get(ApiContext apiContext, Intege
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, cashRegisterId, cashRegisterQrCodeId), new HashMap<>(), customHeaders);
 
-    return fromJson(CashRegisterQrCode.class, responseRaw, OBJECT_TYPE);
+    return fromJson(CashRegisterQrCode.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<CashRegisterQrCode>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId) {
@@ -148,7 +148,7 @@ public static BunqResponse<List<CashRegisterQrCode>> list(ApiContext apiContext,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, cashRegisterId), params, customHeaders);
 
-    return fromJsonList(CashRegisterQrCode.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CashRegisterQrCode.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCodeContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCodeContent.java
index a6fb5dc9..cbfa1ba2 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCodeContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CashRegisterQrCodeContent.java
@@ -30,7 +30,7 @@ public class CashRegisterQrCodeContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CashRegisterQrCodeContent";
+  private static final String OBJECT_TYPE_GET = "CashRegisterQrCodeContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId, Integer qrCodeId) {
     return list(apiContext, userId, monetaryAccountId, cashRegisterId, qrCodeId, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CertificatePinned.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CertificatePinned.java
index b513334d..496dae0e 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CertificatePinned.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CertificatePinned.java
@@ -39,7 +39,7 @@ public class CertificatePinned extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CertificatePinned";
+  private static final String OBJECT_TYPE_GET = "CertificatePinned";
 
   /**
    * The certificate chain in .PEM format. Certificates are glued with newline characters.
@@ -99,7 +99,7 @@ public static BunqResponse<List<CertificatePinned>> list(ApiContext apiContext,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(CertificatePinned.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CertificatePinned.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<CertificatePinned> get(ApiContext apiContext, Integer userId, Integer certificatePinnedId) {
@@ -113,7 +113,7 @@ public static BunqResponse<CertificatePinned> get(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, certificatePinnedId), new HashMap<>(), customHeaders);
 
-    return fromJson(CertificatePinned.class, responseRaw, OBJECT_TYPE);
+    return fromJson(CertificatePinned.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversation.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversation.java
index 701b1b02..ec2fc9d2 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversation.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversation.java
@@ -37,7 +37,7 @@ public class ChatConversation extends BunqModel implements AnchorObjectInterface
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatConversation";
+  private static final String OBJECT_TYPE_GET = "ChatConversation";
 
   /**
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationReference.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationReference.java
index 17fea384..db5d7ea1 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationReference.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationReference.java
@@ -16,11 +16,6 @@
  */
 public class ChatConversationReference extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "SupportConversationReference";
-
   /**
    * The id of this conversation.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationSupportExternal.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationSupportExternal.java
index c2398c76..c4a75208 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationSupportExternal.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatConversationSupportExternal.java
@@ -16,11 +16,6 @@
  */
 public class ChatConversationSupportExternal extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "SupportConversationExternal";
-
   /**
    * The id of this conversation.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessage.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessage.java
index 096c18f4..24d9db51 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessage.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessage.java
@@ -36,7 +36,7 @@ public class ChatMessage extends BunqModel implements AnchorObjectInterface {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatMessage";
+  private static final String OBJECT_TYPE_GET = "ChatMessage";
 
   /**
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAnnouncement.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAnnouncement.java
index ae7ad2ae..8e453142 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAnnouncement.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAnnouncement.java
@@ -18,11 +18,6 @@
  */
 public class ChatMessageAnnouncement extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "ChatMessageUser";
-
   /**
    * The id of the message.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAttachment.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAttachment.java
index 9caf34d8..99fd8486 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAttachment.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageAttachment.java
@@ -32,11 +32,6 @@ public class ChatMessageAttachment extends BunqModel {
   public static final String FIELD_CLIENT_MESSAGE_UUID = "client_message_uuid";
   public static final String FIELD_ATTACHMENT = "attachment";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "Id";
-
   /**
    * The id of the newly created chat message.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageStatus.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageStatus.java
index baed807d..049c8968 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageStatus.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageStatus.java
@@ -18,11 +18,6 @@
  */
 public class ChatMessageStatus extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "ChatMessageUser";
-
   /**
    * The id of the message.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageText.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageText.java
index 7b5d5abe..deaefaec 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageText.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageText.java
@@ -32,11 +32,6 @@ public class ChatMessageText extends BunqModel {
   public static final String FIELD_CLIENT_MESSAGE_UUID = "client_message_uuid";
   public static final String FIELD_TEXT = "text";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "Id";
-
   /**
    * The id of the newly created chat message.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageUser.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageUser.java
index a4381677..6b1c49d6 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageUser.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ChatMessageUser.java
@@ -18,11 +18,6 @@
  */
 public class ChatMessageUser extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "ChatMessageUser";
-
   /**
    * The id of the message.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Customer.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Customer.java
index ad8f7cdc..a4739266 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Customer.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Customer.java
@@ -36,7 +36,7 @@ public class Customer extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Customer";
+  private static final String OBJECT_TYPE_GET = "Customer";
 
   /**
    * The id of the customer.
@@ -80,7 +80,7 @@ public static BunqResponse<List<Customer>> list(ApiContext apiContext, Integer u
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(Customer.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(Customer.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Customer> get(ApiContext apiContext, Integer userId, Integer customerId) {
@@ -93,7 +93,7 @@ public static BunqResponse<Customer> get(ApiContext apiContext, Integer userId,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, customerId), new HashMap<>(), customHeaders);
 
-    return fromJson(Customer.class, responseRaw, OBJECT_TYPE);
+    return fromJson(Customer.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer customerId) {
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerLimit.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerLimit.java
index 984156c2..36b07a66 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerLimit.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerLimit.java
@@ -29,7 +29,7 @@ public class CustomerLimit extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CustomerLimit";
+  private static final String OBJECT_TYPE_GET = "CustomerLimit";
 
   /**
    * The limit of monetary accounts.
@@ -81,7 +81,7 @@ public static BunqResponse<List<CustomerLimit>> list(ApiContext apiContext, Inte
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(CustomerLimit.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CustomerLimit.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerStatementExport.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerStatementExport.java
index 0dc2b228..6692adce 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerStatementExport.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerStatementExport.java
@@ -42,7 +42,7 @@ public class CustomerStatementExport extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CustomerStatementExport";
+  private static final String OBJECT_TYPE_GET = "CustomerStatementExport";
 
   /**
    * The id of the customer statement model.
@@ -138,7 +138,7 @@ public static BunqResponse<CustomerStatementExport> get(ApiContext apiContext, I
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, customerStatementExportId), new HashMap<>(), customHeaders);
 
-    return fromJson(CustomerStatementExport.class, responseRaw, OBJECT_TYPE);
+    return fromJson(CustomerStatementExport.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<CustomerStatementExport>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -155,7 +155,7 @@ public static BunqResponse<List<CustomerStatementExport>> list(ApiContext apiCon
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(CustomerStatementExport.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(CustomerStatementExport.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer customerStatementExportId) {
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerStatementExportContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerStatementExportContent.java
index 110c702a..d02454a5 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerStatementExportContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/CustomerStatementExportContent.java
@@ -31,7 +31,7 @@ public class CustomerStatementExportContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CustomerStatementExportContent";
+  private static final String OBJECT_TYPE_GET = "CustomerStatementExportContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer customerStatementId) {
     return list(apiContext, userId, monetaryAccountId, customerStatementId, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Device.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Device.java
index bf1ac8f2..36ecc6ba 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Device.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Device.java
@@ -38,7 +38,7 @@ public class Device extends BunqModel implements AnchorObjectInterface {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Device";
+  private static final String OBJECT_TYPE_GET = "Device";
 
   /**
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/DeviceServer.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/DeviceServer.java
index 0ab60b71..75d41b90 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/DeviceServer.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/DeviceServer.java
@@ -39,7 +39,7 @@ public class DeviceServer extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "DeviceServer";
+  private static final String OBJECT_TYPE_GET = "DeviceServer";
 
   /**
    * The id of the DeviceServer as created on the server.
@@ -115,7 +115,7 @@ public static BunqResponse<DeviceServer> get(ApiContext apiContext, Integer devi
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, deviceServerId), new HashMap<>(), customHeaders);
 
-    return fromJson(DeviceServer.class, responseRaw, OBJECT_TYPE);
+    return fromJson(DeviceServer.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<DeviceServer>> list(ApiContext apiContext) {
@@ -133,7 +133,7 @@ public static BunqResponse<List<DeviceServer>> list(ApiContext apiContext, Map<S
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(ENDPOINT_URL_LISTING, params, customHeaders);
 
-    return fromJsonList(DeviceServer.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(DeviceServer.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftPayment.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftPayment.java
index 0dadaaac..b7e07b96 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftPayment.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftPayment.java
@@ -45,7 +45,7 @@ public class DraftPayment extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "DraftPayment";
+  private static final String OBJECT_TYPE_GET = "DraftPayment";
 
   /**
    * The id of the created DrafPayment.
@@ -149,7 +149,7 @@ public static BunqResponse<List<DraftPayment>> list(ApiContext apiContext, Integ
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(DraftPayment.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(DraftPayment.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<DraftPayment> get(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer draftPaymentId) {
@@ -163,7 +163,7 @@ public static BunqResponse<DraftPayment> get(ApiContext apiContext, Integer user
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, draftPaymentId), new HashMap<>(), customHeaders);
 
-    return fromJson(DraftPayment.class, responseRaw, OBJECT_TYPE);
+    return fromJson(DraftPayment.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBank.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBank.java
index a4229bb8..32c8bf72 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBank.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBank.java
@@ -43,7 +43,7 @@ public class DraftShareInviteBank extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "DraftShareInviteBank";
+  private static final String OBJECT_TYPE_GET = "DraftShareInviteBank";
 
   /**
    * The user who created the draft share invite.
@@ -119,10 +119,10 @@ public static BunqResponse<DraftShareInviteBank> get(ApiContext apiContext, Inte
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, draftShareInviteBankId), new HashMap<>(), customHeaders);
 
-    return fromJson(DraftShareInviteBank.class, responseRaw, OBJECT_TYPE);
+    return fromJson(DraftShareInviteBank.class, responseRaw, OBJECT_TYPE_GET);
   }
 
-  public static BunqResponse<DraftShareInviteBank> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer draftShareInviteBankId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer draftShareInviteBankId) {
     return update(apiContext, requestMap, userId, draftShareInviteBankId, new HashMap<>());
   }
 
@@ -130,12 +130,12 @@ public static BunqResponse<DraftShareInviteBank> update(ApiContext apiContext, M
    * Update a draft share invite. When sending status CANCELLED it is possible to cancel the draft
    * share invite.
    */
-  public static BunqResponse<DraftShareInviteBank> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer draftShareInviteBankId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer draftShareInviteBankId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, draftShareInviteBankId), requestBytes, customHeaders);
 
-    return fromJson(DraftShareInviteBank.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<DraftShareInviteBank>> list(ApiContext apiContext, Integer userId) {
@@ -152,7 +152,7 @@ public static BunqResponse<List<DraftShareInviteBank>> list(ApiContext apiContex
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(DraftShareInviteBank.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(DraftShareInviteBank.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContent.java
index 07b252cc..b76761c5 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/DraftShareInviteBankQrCodeContent.java
@@ -31,7 +31,7 @@ public class DraftShareInviteBankQrCodeContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "DraftShareInviteBankQrCodeContent";
+  private static final String OBJECT_TYPE_GET = "DraftShareInviteBankQrCodeContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, Integer draftShareInviteBankId) {
     return list(apiContext, userId, draftShareInviteBankId, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ExportAnnualOverview.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ExportAnnualOverview.java
index a4b791c2..8d3c5ab7 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ExportAnnualOverview.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ExportAnnualOverview.java
@@ -39,7 +39,7 @@ public class ExportAnnualOverview extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ExportAnnualOverview";
+  private static final String OBJECT_TYPE_GET = "ExportAnnualOverview";
 
   /**
    * The id of the annual overview as created on the server.
@@ -103,7 +103,7 @@ public static BunqResponse<ExportAnnualOverview> get(ApiContext apiContext, Inte
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, exportAnnualOverviewId), new HashMap<>(), customHeaders);
 
-    return fromJson(ExportAnnualOverview.class, responseRaw, OBJECT_TYPE);
+    return fromJson(ExportAnnualOverview.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<ExportAnnualOverview>> list(ApiContext apiContext, Integer userId) {
@@ -121,7 +121,7 @@ public static BunqResponse<List<ExportAnnualOverview>> list(ApiContext apiContex
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(ExportAnnualOverview.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(ExportAnnualOverview.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ExportAnnualOverviewContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ExportAnnualOverviewContent.java
index 704b1b41..26a7d33c 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ExportAnnualOverviewContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ExportAnnualOverviewContent.java
@@ -30,7 +30,7 @@ public class ExportAnnualOverviewContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ExportAnnualOverviewContent";
+  private static final String OBJECT_TYPE_GET = "ExportAnnualOverviewContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, Integer exportAnnualOverviewId) {
     return list(apiContext, userId, exportAnnualOverviewId, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/IdealMerchantTransaction.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/IdealMerchantTransaction.java
index 2fd91256..98b10d19 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/IdealMerchantTransaction.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/IdealMerchantTransaction.java
@@ -39,7 +39,7 @@ public class IdealMerchantTransaction extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "IdealMerchantTransaction";
+  private static final String OBJECT_TYPE_GET = "IdealMerchantTransaction";
 
   /**
    * The id of the monetary account this ideal merchant transaction links to.
@@ -163,7 +163,7 @@ public static BunqResponse<IdealMerchantTransaction> get(ApiContext apiContext,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, idealMerchantTransactionId), new HashMap<>(), customHeaders);
 
-    return fromJson(IdealMerchantTransaction.class, responseRaw, OBJECT_TYPE);
+    return fromJson(IdealMerchantTransaction.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<IdealMerchantTransaction>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -180,7 +180,7 @@ public static BunqResponse<List<IdealMerchantTransaction>> list(ApiContext apiCo
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(IdealMerchantTransaction.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(IdealMerchantTransaction.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/InstallationServerPublicKey.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/InstallationServerPublicKey.java
index 0075d987..70afeaf0 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/InstallationServerPublicKey.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/InstallationServerPublicKey.java
@@ -30,7 +30,7 @@ public class InstallationServerPublicKey extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ServerPublicKey";
+  private static final String OBJECT_TYPE_GET = "ServerPublicKey";
 
   /**
    * The server's public key for this Installation.
@@ -54,7 +54,7 @@ public static BunqResponse<List<InstallationServerPublicKey>> list(ApiContext ap
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, installationId), params, customHeaders);
 
-    return fromJsonList(InstallationServerPublicKey.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(InstallationServerPublicKey.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Invoice.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Invoice.java
index 74226077..6f9fb83f 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Invoice.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Invoice.java
@@ -41,7 +41,7 @@ public class Invoice extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Invoice";
+  private static final String OBJECT_TYPE_GET = "Invoice";
 
   /**
    * The id of the invoice object.
@@ -169,7 +169,7 @@ public static BunqResponse<List<Invoice>> list(ApiContext apiContext, Integer us
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(Invoice.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(Invoice.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Invoice> get(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer invoiceId) {
@@ -182,7 +182,7 @@ public static BunqResponse<Invoice> get(ApiContext apiContext, Integer userId, I
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, invoiceId), new HashMap<>(), customHeaders);
 
-    return fromJson(Invoice.class, responseRaw, OBJECT_TYPE);
+    return fromJson(Invoice.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/InvoiceByUser.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/InvoiceByUser.java
index 01623160..f4d7ccfa 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/InvoiceByUser.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/InvoiceByUser.java
@@ -34,7 +34,7 @@ public class InvoiceByUser extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Invoice";
+  private static final String OBJECT_TYPE_GET = "Invoice";
 
   /**
    * The id of the invoice object.
@@ -162,7 +162,7 @@ public static BunqResponse<List<InvoiceByUser>> list(ApiContext apiContext, Inte
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(InvoiceByUser.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(InvoiceByUser.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<InvoiceByUser> get(ApiContext apiContext, Integer userId, Integer invoiceByUserId) {
@@ -175,7 +175,7 @@ public static BunqResponse<InvoiceByUser> get(ApiContext apiContext, Integer use
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, invoiceByUserId), new HashMap<>(), customHeaders);
 
-    return fromJson(InvoiceByUser.class, responseRaw, OBJECT_TYPE);
+    return fromJson(InvoiceByUser.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/MasterCardAction.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/MasterCardAction.java
index a992fa07..6b28d8fb 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/MasterCardAction.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/MasterCardAction.java
@@ -33,7 +33,7 @@ public class MasterCardAction extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "MasterCardAction";
+  private static final String OBJECT_TYPE_GET = "MasterCardAction";
 
   /**
    * The id of the MastercardAction.
@@ -214,7 +214,7 @@ public static BunqResponse<MasterCardAction> get(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, masterCardActionId), new HashMap<>(), customHeaders);
 
-    return fromJson(MasterCardAction.class, responseRaw, OBJECT_TYPE);
+    return fromJson(MasterCardAction.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<MasterCardAction>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -231,7 +231,7 @@ public static BunqResponse<List<MasterCardAction>> list(ApiContext apiContext, I
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(MasterCardAction.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(MasterCardAction.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccount.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccount.java
index a4d4b17a..1749b14f 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccount.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccount.java
@@ -40,7 +40,7 @@ public class MonetaryAccount extends BunqModel implements AnchorObjectInterface
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "MonetaryAccount";
+  private static final String OBJECT_TYPE_GET = "MonetaryAccount";
 
   /**
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccountBank.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccountBank.java
index c29c0b89..d9dcaede 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccountBank.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccountBank.java
@@ -59,7 +59,7 @@ public class MonetaryAccountBank extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "MonetaryAccountBank";
+  private static final String OBJECT_TYPE_GET = "MonetaryAccountBank";
 
   /**
    * The id of the MonetaryAccountBank.
@@ -232,7 +232,7 @@ public static BunqResponse<MonetaryAccountBank> get(ApiContext apiContext, Integ
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountBankId), new HashMap<>(), customHeaders);
 
-    return fromJson(MonetaryAccountBank.class, responseRaw, OBJECT_TYPE);
+    return fromJson(MonetaryAccountBank.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountBankId) {
@@ -265,7 +265,7 @@ public static BunqResponse<List<MonetaryAccountBank>> list(ApiContext apiContext
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(MonetaryAccountBank.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(MonetaryAccountBank.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccountProfile.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccountProfile.java
index f704e068..ac08f51e 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccountProfile.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/MonetaryAccountProfile.java
@@ -25,11 +25,6 @@ public class MonetaryAccountProfile extends BunqModel {
   public static final String FIELD_PROFILE_FILL = "profile_fill";
   public static final String FIELD_PROFILE_DRAIN = "profile_drain";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "MonetaryAccountProfile";
-
   /**
    * The profile settings for triggering the fill of a monetary account.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Payment.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Payment.java
index b2c1e62e..4f131cb2 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Payment.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Payment.java
@@ -51,7 +51,7 @@ public class Payment extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Payment";
+  private static final String OBJECT_TYPE_GET = "Payment";
 
   /**
    * The id of the created Payment.
@@ -247,7 +247,7 @@ public static BunqResponse<Payment> get(ApiContext apiContext, Integer userId, I
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, paymentId), new HashMap<>(), customHeaders);
 
-    return fromJson(Payment.class, responseRaw, OBJECT_TYPE);
+    return fromJson(Payment.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<Payment>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -265,7 +265,7 @@ public static BunqResponse<List<Payment>> list(ApiContext apiContext, Integer us
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(Payment.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(Payment.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentBatch.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentBatch.java
index fff981ca..e22add8b 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentBatch.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentBatch.java
@@ -38,7 +38,7 @@ public class PaymentBatch extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "PaymentBatch";
+  private static final String OBJECT_TYPE_GET = "PaymentBatch";
 
   /**
    * The list of mutations that were made.
@@ -89,7 +89,7 @@ public static BunqResponse<PaymentBatch> get(ApiContext apiContext, Integer user
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, paymentBatchId), new HashMap<>(), customHeaders);
 
-    return fromJson(PaymentBatch.class, responseRaw, OBJECT_TYPE);
+    return fromJson(PaymentBatch.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<PaymentBatch>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -107,7 +107,7 @@ public static BunqResponse<List<PaymentBatch>> list(ApiContext apiContext, Integ
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(PaymentBatch.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(PaymentBatch.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentChat.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentChat.java
index 3f1aa879..ab0535bd 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentChat.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/PaymentChat.java
@@ -36,7 +36,7 @@ public class PaymentChat extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ChatConversationPayment";
+  private static final String OBJECT_TYPE_GET = "ChatConversationPayment";
 
   /**
    * The id of the chat conversation.
@@ -81,19 +81,19 @@ public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Ob
     return processForId(responseRaw);
   }
 
-  public static BunqResponse<PaymentChat> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer paymentId, Integer paymentChatId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer paymentId, Integer paymentChatId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, paymentId, paymentChatId, new HashMap<>());
   }
 
   /**
    * Update the last read message in the chat of a specific payment.
    */
-  public static BunqResponse<PaymentChat> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer paymentId, Integer paymentChatId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer paymentId, Integer paymentChatId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, paymentId, paymentChatId), requestBytes, customHeaders);
 
-    return fromJson(PaymentChat.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<PaymentChat>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer paymentId) {
@@ -111,7 +111,7 @@ public static BunqResponse<List<PaymentChat>> list(ApiContext apiContext, Intege
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, paymentId), params, customHeaders);
 
-    return fromJsonList(PaymentChat.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(PaymentChat.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/PermittedIp.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/PermittedIp.java
index fe131082..9439f280 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/PermittedIp.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/PermittedIp.java
@@ -38,7 +38,7 @@ public class PermittedIp extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "PermittedIp";
+  private static final String OBJECT_TYPE_GET = "PermittedIp";
 
   /**
    * The IP address.
@@ -65,7 +65,7 @@ public static BunqResponse<PermittedIp> get(ApiContext apiContext, Integer userI
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, credentialPasswordIpId, permittedIpId), new HashMap<>(), customHeaders);
 
-    return fromJson(PermittedIp.class, responseRaw, OBJECT_TYPE);
+    return fromJson(PermittedIp.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer credentialPasswordIpId) {
@@ -96,7 +96,7 @@ public static BunqResponse<List<PermittedIp>> list(ApiContext apiContext, Intege
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, credentialPasswordIpId), params, customHeaders);
 
-    return fromJsonList(PermittedIp.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(PermittedIp.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer credentialPasswordIpId, Integer permittedIpId) {
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/PromotionDisplay.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/PromotionDisplay.java
index daa02bb3..8c2c5032 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/PromotionDisplay.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/PromotionDisplay.java
@@ -36,7 +36,7 @@ public class PromotionDisplay extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "PromotionDisplay";
+  private static final String OBJECT_TYPE_GET = "PromotionDisplay";
 
   /**
    * The id of the promotion.
@@ -76,7 +76,7 @@ public static BunqResponse<PromotionDisplay> get(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, promotionDisplayId), new HashMap<>(), customHeaders);
 
-    return fromJson(PromotionDisplay.class, responseRaw, OBJECT_TYPE);
+    return fromJson(PromotionDisplay.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer promotionDisplayId) {
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiry.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiry.java
index 16b70811..62c1b486 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiry.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiry.java
@@ -59,7 +59,8 @@ public class RequestInquiry extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "RequestInquiry";
+  private static final String OBJECT_TYPE_PUT = "RequestInquiry";
+  private static final String OBJECT_TYPE_GET = "RequestInquiry";
 
   /**
    * The id of the created RequestInquiry.
@@ -264,7 +265,7 @@ public static BunqResponse<RequestInquiry> update(ApiContext apiContext, Map<Str
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, requestInquiryId), requestBytes, customHeaders);
 
-    return fromJson(RequestInquiry.class, responseRaw, OBJECT_TYPE);
+    return fromJson(RequestInquiry.class, responseRaw, OBJECT_TYPE_PUT);
   }
 
   public static BunqResponse<List<RequestInquiry>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -282,7 +283,7 @@ public static BunqResponse<List<RequestInquiry>> list(ApiContext apiContext, Int
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(RequestInquiry.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(RequestInquiry.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<RequestInquiry> get(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer requestInquiryId) {
@@ -296,7 +297,7 @@ public static BunqResponse<RequestInquiry> get(ApiContext apiContext, Integer us
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, requestInquiryId), new HashMap<>(), customHeaders);
 
-    return fromJson(RequestInquiry.class, responseRaw, OBJECT_TYPE);
+    return fromJson(RequestInquiry.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiryBatch.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiryBatch.java
index 87b53bfe..91ba9002 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiryBatch.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiryBatch.java
@@ -40,7 +40,7 @@ public class RequestInquiryBatch extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "RequestInquiryBatch";
+  private static final String OBJECT_TYPE_GET = "RequestInquiryBatch";
 
   /**
    * The list of requests that were made.
@@ -98,7 +98,7 @@ public static BunqResponse<RequestInquiryBatch> get(ApiContext apiContext, Integ
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, requestInquiryBatchId), new HashMap<>(), customHeaders);
 
-    return fromJson(RequestInquiryBatch.class, responseRaw, OBJECT_TYPE);
+    return fromJson(RequestInquiryBatch.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<RequestInquiryBatch>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -116,7 +116,7 @@ public static BunqResponse<List<RequestInquiryBatch>> list(ApiContext apiContext
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(RequestInquiryBatch.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(RequestInquiryBatch.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiryChat.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiryChat.java
index 3961c0a1..666acac9 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiryChat.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestInquiryChat.java
@@ -39,7 +39,7 @@ public class RequestInquiryChat extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "RequestInquiryChat";
+  private static final String OBJECT_TYPE_GET = "RequestInquiryChat";
 
   /**
    * The id of the newly created chat conversation.
@@ -84,19 +84,19 @@ public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Ob
     return processForId(responseRaw);
   }
 
-  public static BunqResponse<RequestInquiryChat> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer requestInquiryId, Integer requestInquiryChatId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer requestInquiryId, Integer requestInquiryChatId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, requestInquiryId, requestInquiryChatId, new HashMap<>());
   }
 
   /**
    * Update the last read message in the chat of a specific request inquiry.
    */
-  public static BunqResponse<RequestInquiryChat> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer requestInquiryId, Integer requestInquiryChatId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer requestInquiryId, Integer requestInquiryChatId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, requestInquiryId, requestInquiryChatId), requestBytes, customHeaders);
 
-    return fromJson(RequestInquiryChat.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<RequestInquiryChat>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer requestInquiryId) {
@@ -114,7 +114,7 @@ public static BunqResponse<List<RequestInquiryChat>> list(ApiContext apiContext,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, requestInquiryId), params, customHeaders);
 
-    return fromJsonList(RequestInquiryChat.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(RequestInquiryChat.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestResponse.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestResponse.java
index ed8bbbd2..60904e1c 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestResponse.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestResponse.java
@@ -47,7 +47,8 @@ public class RequestResponse extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "RequestResponse";
+  private static final String OBJECT_TYPE_PUT = "RequestResponse";
+  private static final String OBJECT_TYPE_GET = "RequestResponse";
 
   /**
    * The id of the Request Response.
@@ -241,7 +242,7 @@ public static BunqResponse<RequestResponse> update(ApiContext apiContext, Map<St
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, requestResponseId), requestBytes, customHeaders);
 
-    return fromJson(RequestResponse.class, responseRaw, OBJECT_TYPE);
+    return fromJson(RequestResponse.class, responseRaw, OBJECT_TYPE_PUT);
   }
 
   public static BunqResponse<List<RequestResponse>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -259,7 +260,7 @@ public static BunqResponse<List<RequestResponse>> list(ApiContext apiContext, In
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(RequestResponse.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(RequestResponse.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<RequestResponse> get(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer requestResponseId) {
@@ -273,7 +274,7 @@ public static BunqResponse<RequestResponse> get(ApiContext apiContext, Integer u
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, requestResponseId), new HashMap<>(), customHeaders);
 
-    return fromJson(RequestResponse.class, responseRaw, OBJECT_TYPE);
+    return fromJson(RequestResponse.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestResponseChat.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestResponseChat.java
index f5b9d640..cb3a0dfe 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestResponseChat.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/RequestResponseChat.java
@@ -39,7 +39,7 @@ public class RequestResponseChat extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "RequestResponseChat";
+  private static final String OBJECT_TYPE_GET = "RequestResponseChat";
 
   /**
    * The id of the newly created chat conversation.
@@ -84,19 +84,19 @@ public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Ob
     return processForId(responseRaw);
   }
 
-  public static BunqResponse<RequestResponseChat> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer requestResponseId, Integer requestResponseChatId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer requestResponseId, Integer requestResponseChatId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, requestResponseId, requestResponseChatId, new HashMap<>());
   }
 
   /**
    * Update the last read message in the chat of a specific request response.
    */
-  public static BunqResponse<RequestResponseChat> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer requestResponseId, Integer requestResponseChatId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer requestResponseId, Integer requestResponseChatId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, requestResponseId, requestResponseChatId), requestBytes, customHeaders);
 
-    return fromJson(RequestResponseChat.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<RequestResponseChat>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer requestResponseId) {
@@ -114,7 +114,7 @@ public static BunqResponse<List<RequestResponseChat>> list(ApiContext apiContext
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, requestResponseId), params, customHeaders);
 
-    return fromJsonList(RequestResponseChat.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(RequestResponseChat.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Schedule.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Schedule.java
index 170d8e5f..145f36c6 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Schedule.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Schedule.java
@@ -39,7 +39,7 @@ public class Schedule extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Schedule";
+  private static final String OBJECT_TYPE_GET = "Schedule";
 
   /**
    * The schedule start time (UTC).
@@ -95,7 +95,7 @@ public static BunqResponse<Schedule> get(ApiContext apiContext, Integer userId,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, scheduleId), new HashMap<>(), customHeaders);
 
-    return fromJson(Schedule.class, responseRaw, OBJECT_TYPE);
+    return fromJson(Schedule.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<Schedule>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -116,7 +116,7 @@ public static BunqResponse<List<Schedule>> list(ApiContext apiContext, Integer u
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(Schedule.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(Schedule.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleInstance.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleInstance.java
index 75b99027..ee3a53aa 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleInstance.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleInstance.java
@@ -39,7 +39,7 @@ public class ScheduleInstance extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ScheduledInstance";
+  private static final String OBJECT_TYPE_GET = "ScheduledInstance";
 
   /**
    * The state of the scheduleInstance. (FINISHED_SUCCESSFULLY, RETRY, FAILED_USER_ERROR)
@@ -93,21 +93,21 @@ public static BunqResponse<ScheduleInstance> get(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, scheduleId, scheduleInstanceId), new HashMap<>(), customHeaders);
 
-    return fromJson(ScheduleInstance.class, responseRaw, OBJECT_TYPE);
+    return fromJson(ScheduleInstance.class, responseRaw, OBJECT_TYPE_GET);
   }
 
-  public static BunqResponse<ScheduleInstance> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer scheduleId, Integer scheduleInstanceId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer scheduleId, Integer scheduleInstanceId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, scheduleId, scheduleInstanceId, new HashMap<>());
   }
 
   /**
    */
-  public static BunqResponse<ScheduleInstance> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer scheduleId, Integer scheduleInstanceId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer scheduleId, Integer scheduleInstanceId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, scheduleId, scheduleInstanceId), requestBytes, customHeaders);
 
-    return fromJson(ScheduleInstance.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<ScheduleInstance>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer scheduleId) {
@@ -124,7 +124,7 @@ public static BunqResponse<List<ScheduleInstance>> list(ApiContext apiContext, I
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, scheduleId), params, customHeaders);
 
-    return fromJsonList(ScheduleInstance.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(ScheduleInstance.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePayment.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePayment.java
index 62f0f3d4..d53921ba 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePayment.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePayment.java
@@ -40,7 +40,7 @@ public class SchedulePayment extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ScheduledPayment";
+  private static final String OBJECT_TYPE_GET = "ScheduledPayment";
 
   /**
    * The payment details.
@@ -93,7 +93,7 @@ public static BunqResponse<SchedulePayment> get(ApiContext apiContext, Integer u
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, schedulePaymentId), new HashMap<>(), customHeaders);
 
-    return fromJson(SchedulePayment.class, responseRaw, OBJECT_TYPE);
+    return fromJson(SchedulePayment.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<SchedulePayment>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -110,21 +110,21 @@ public static BunqResponse<List<SchedulePayment>> list(ApiContext apiContext, In
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(SchedulePayment.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(SchedulePayment.class, responseRaw, OBJECT_TYPE_GET);
   }
 
-  public static BunqResponse<SchedulePayment> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, schedulePaymentId, new HashMap<>());
   }
 
   /**
    */
-  public static BunqResponse<SchedulePayment> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, schedulePaymentId), requestBytes, customHeaders);
 
-    return fromJson(SchedulePayment.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePaymentBatch.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePaymentBatch.java
index c5412319..5fa6a3d1 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePaymentBatch.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/SchedulePaymentBatch.java
@@ -35,11 +35,6 @@ public class SchedulePaymentBatch extends BunqModel {
   public static final String FIELD_PAYMENTS = "payments";
   public static final String FIELD_SCHEDULE = "schedule";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "ScheduledPaymentBatch";
-
   /**
    * The payment details.
    */
@@ -68,18 +63,18 @@ public static BunqResponse<Integer> create(ApiContext apiContext, Map<String, Ob
     return processForId(responseRaw);
   }
 
-  public static BunqResponse<SchedulePaymentBatch> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentBatchId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentBatchId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, schedulePaymentBatchId, new HashMap<>());
   }
 
   /**
    */
-  public static BunqResponse<SchedulePaymentBatch> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentBatchId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer schedulePaymentBatchId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, schedulePaymentBatchId), requestBytes, customHeaders);
 
-    return fromJson(SchedulePaymentBatch.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer schedulePaymentBatchId) {
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleUser.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleUser.java
index 203154b3..3be8b3d9 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleUser.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ScheduleUser.java
@@ -29,7 +29,7 @@ public class ScheduleUser extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ScheduleUser";
+  private static final String OBJECT_TYPE_GET = "ScheduleUser";
 
   public static BunqResponse<List<ScheduleUser>> list(ApiContext apiContext, Integer userId) {
     return list(apiContext, userId, new HashMap<>());
@@ -49,7 +49,7 @@ public static BunqResponse<List<ScheduleUser>> list(ApiContext apiContext, Integ
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(ScheduleUser.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(ScheduleUser.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Session.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Session.java
index 900c4871..11c4c3e6 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Session.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Session.java
@@ -26,17 +26,12 @@ public class Session extends BunqModel {
    */
   private static final String ENDPOINT_URL_DELETE = "session/%s";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "Session";
-
   public static BunqResponse<NullType> delete(ApiContext apiContext, Integer sessionId) {
     return delete(apiContext, sessionId, new HashMap<>());
   }
 
   /**
-   * Deletes the current session. No response is returned for this request.
+   * Deletes the current session.
    */
   public static BunqResponse<NullType> delete(ApiContext apiContext, Integer sessionId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankAmountUsed.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankAmountUsed.java
index 8e1d909c..6abea5f9 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankAmountUsed.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankAmountUsed.java
@@ -29,11 +29,6 @@ public class ShareInviteBankAmountUsed extends BunqModel {
    */
   private static final String ENDPOINT_URL_DELETE = "user/%s/monetary-account/%s/share-invite-bank-inquiry/%s/amount-used/%s";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "ShareInviteBankAmountUsed";
-
   public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer shareInviteBankInquiryId, Integer shareInviteBankAmountUsedId) {
     return delete(apiContext, userId, monetaryAccountId, shareInviteBankInquiryId, shareInviteBankAmountUsedId, new HashMap<>());
   }
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankInquiry.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankInquiry.java
index 02a445f2..216031b4 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankInquiry.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankInquiry.java
@@ -48,7 +48,7 @@ public class ShareInviteBankInquiry extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ShareInviteBankInquiry";
+  private static final String OBJECT_TYPE_GET = "ShareInviteBankInquiry";
 
   /**
    * The label of the monetary account that's being shared.
@@ -164,10 +164,10 @@ public static BunqResponse<ShareInviteBankInquiry> get(ApiContext apiContext, In
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, shareInviteBankInquiryId), new HashMap<>(), customHeaders);
 
-    return fromJson(ShareInviteBankInquiry.class, responseRaw, OBJECT_TYPE);
+    return fromJson(ShareInviteBankInquiry.class, responseRaw, OBJECT_TYPE_GET);
   }
 
-  public static BunqResponse<ShareInviteBankInquiry> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer shareInviteBankInquiryId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer shareInviteBankInquiryId) {
     return update(apiContext, requestMap, userId, monetaryAccountId, shareInviteBankInquiryId, new HashMap<>());
   }
 
@@ -175,12 +175,12 @@ public static BunqResponse<ShareInviteBankInquiry> update(ApiContext apiContext,
    * Update the details of a share. This includes updating status (revoking or cancelling it),
    * granted permission and validity period of this share.
    */
-  public static BunqResponse<ShareInviteBankInquiry> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer shareInviteBankInquiryId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer monetaryAccountId, Integer shareInviteBankInquiryId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, monetaryAccountId, shareInviteBankInquiryId), requestBytes, customHeaders);
 
-    return fromJson(ShareInviteBankInquiry.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<ShareInviteBankInquiry>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -199,7 +199,7 @@ public static BunqResponse<List<ShareInviteBankInquiry>> list(ApiContext apiCont
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(ShareInviteBankInquiry.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(ShareInviteBankInquiry.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankResponse.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankResponse.java
index 1cac64e9..841ec39e 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankResponse.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/ShareInviteBankResponse.java
@@ -40,7 +40,7 @@ public class ShareInviteBankResponse extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "ShareInviteBankResponse";
+  private static final String OBJECT_TYPE_GET = "ShareInviteBankResponse";
 
   /**
    * The monetary account and user who created the share.
@@ -126,22 +126,22 @@ public static BunqResponse<ShareInviteBankResponse> get(ApiContext apiContext, I
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, shareInviteBankResponseId), new HashMap<>(), customHeaders);
 
-    return fromJson(ShareInviteBankResponse.class, responseRaw, OBJECT_TYPE);
+    return fromJson(ShareInviteBankResponse.class, responseRaw, OBJECT_TYPE_GET);
   }
 
-  public static BunqResponse<ShareInviteBankResponse> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer shareInviteBankResponseId) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer shareInviteBankResponseId) {
     return update(apiContext, requestMap, userId, shareInviteBankResponseId, new HashMap<>());
   }
 
   /**
    * Accept or reject a share a user was invited to.
    */
-  public static BunqResponse<ShareInviteBankResponse> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer shareInviteBankResponseId, Map<String, String> customHeaders) {
+  public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userId, Integer shareInviteBankResponseId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.put(String.format(ENDPOINT_URL_UPDATE, userId, shareInviteBankResponseId), requestBytes, customHeaders);
 
-    return fromJson(ShareInviteBankResponse.class, responseRaw, OBJECT_TYPE);
+    return processForId(responseRaw);
   }
 
   public static BunqResponse<List<ShareInviteBankResponse>> list(ApiContext apiContext, Integer userId) {
@@ -159,7 +159,7 @@ public static BunqResponse<List<ShareInviteBankResponse>> list(ApiContext apiCon
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(ShareInviteBankResponse.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(ShareInviteBankResponse.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/Tab.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/Tab.java
index 8486f6a1..03310144 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/Tab.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/Tab.java
@@ -41,7 +41,7 @@ public class Tab extends BunqModel implements AnchorObjectInterface {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "Tab";
+  private static final String OBJECT_TYPE_GET = "Tab";
 
   /**
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabAttachmentTab.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabAttachmentTab.java
index c0724f30..20228366 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabAttachmentTab.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabAttachmentTab.java
@@ -30,7 +30,7 @@ public class TabAttachmentTab extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TabAttachmentTab";
+  private static final String OBJECT_TYPE_GET = "TabAttachmentTab";
 
   /**
    * The id of the attachment.
@@ -72,7 +72,7 @@ public static BunqResponse<TabAttachmentTab> get(ApiContext apiContext, String t
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, tabUuid, tabAttachmentTabId), new HashMap<>(), customHeaders);
 
-    return fromJson(TabAttachmentTab.class, responseRaw, OBJECT_TYPE);
+    return fromJson(TabAttachmentTab.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabAttachmentTabContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabAttachmentTabContent.java
index 5c46056b..29a9deb2 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabAttachmentTabContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabAttachmentTabContent.java
@@ -30,7 +30,7 @@ public class TabAttachmentTabContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TabAttachmentTabContent";
+  private static final String OBJECT_TYPE_GET = "TabAttachmentTabContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, String tabUuid, Integer attachmentId) {
     return list(apiContext, tabUuid, attachmentId, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItem.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItem.java
index 2ec326b6..e26fdd40 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItem.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItem.java
@@ -19,11 +19,6 @@
  */
 public class TabItem extends BunqModel {
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "TabItem";
-
   /**
    * The id of the tab item.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItemShop.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItemShop.java
index 7fd97724..bd1e4ab7 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItemShop.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItemShop.java
@@ -51,7 +51,7 @@ public class TabItemShop extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TabItem";
+  private static final String OBJECT_TYPE_GET = "TabItem";
 
   /**
    * The id of the created TabItem.
@@ -137,7 +137,7 @@ public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userI
   }
 
   /**
-   * Delete a specific TabItem from a Tab. This request returns an empty response.
+   * Delete a specific TabItem from a Tab.
    */
   public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId, String tabUuid, Integer tabItemShopId, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
@@ -161,7 +161,7 @@ public static BunqResponse<List<TabItemShop>> list(ApiContext apiContext, Intege
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, cashRegisterId, tabUuid), params, customHeaders);
 
-    return fromJsonList(TabItemShop.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(TabItemShop.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<TabItemShop> get(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId, String tabUuid, Integer tabItemShopId) {
@@ -175,7 +175,7 @@ public static BunqResponse<TabItemShop> get(ApiContext apiContext, Integer userI
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, cashRegisterId, tabUuid, tabItemShopId), new HashMap<>(), customHeaders);
 
-    return fromJson(TabItemShop.class, responseRaw, OBJECT_TYPE);
+    return fromJson(TabItemShop.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItemShopBatch.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItemShopBatch.java
index 097fcce4..8a4c375f 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItemShopBatch.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabItemShopBatch.java
@@ -31,11 +31,6 @@ public class TabItemShopBatch extends BunqModel {
    */
   public static final String FIELD_TAB_ITEMS = "tab_items";
 
-  /**
-   * Object type.
-   */
-  private static final String OBJECT_TYPE = "TabItemShopBatch";
-
   /**
    * The list of tab items in the batch.
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabQrCodeContent.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabQrCodeContent.java
index c17823a1..767ce490 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabQrCodeContent.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabQrCodeContent.java
@@ -30,7 +30,7 @@ public class TabQrCodeContent extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TabQrCodeContent";
+  private static final String OBJECT_TYPE_GET = "TabQrCodeContent";
 
   public static BunqResponse<byte[]> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId, String tabUuid) {
     return list(apiContext, userId, monetaryAccountId, cashRegisterId, tabUuid, new HashMap<>());
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabResultInquiry.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabResultInquiry.java
index 83e4eebb..1c02a2fb 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabResultInquiry.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabResultInquiry.java
@@ -31,7 +31,7 @@ public class TabResultInquiry extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TabResultInquiry";
+  private static final String OBJECT_TYPE_GET = "TabResultInquiry";
 
   /**
    * The Tab details.
@@ -58,7 +58,7 @@ public static BunqResponse<TabResultInquiry> get(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, cashRegisterId, tabUuid, tabResultInquiryId), new HashMap<>(), customHeaders);
 
-    return fromJson(TabResultInquiry.class, responseRaw, OBJECT_TYPE);
+    return fromJson(TabResultInquiry.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<TabResultInquiry>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId, String tabUuid) {
@@ -76,7 +76,7 @@ public static BunqResponse<List<TabResultInquiry>> list(ApiContext apiContext, I
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, cashRegisterId, tabUuid), params, customHeaders);
 
-    return fromJsonList(TabResultInquiry.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(TabResultInquiry.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabResultResponse.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabResultResponse.java
index da04c2e1..4bad6c0f 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabResultResponse.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabResultResponse.java
@@ -31,7 +31,7 @@ public class TabResultResponse extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TabResultResponse";
+  private static final String OBJECT_TYPE_GET = "TabResultResponse";
 
   /**
    * The Tab details.
@@ -58,7 +58,7 @@ public static BunqResponse<TabResultResponse> get(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, tabResultResponseId), new HashMap<>(), customHeaders);
 
-    return fromJson(TabResultResponse.class, responseRaw, OBJECT_TYPE);
+    return fromJson(TabResultResponse.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<TabResultResponse>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId) {
@@ -76,7 +76,7 @@ public static BunqResponse<List<TabResultResponse>> list(ApiContext apiContext,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId), params, customHeaders);
 
-    return fromJsonList(TabResultResponse.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(TabResultResponse.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabUsageMultiple.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabUsageMultiple.java
index 557f828f..a52660bc 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabUsageMultiple.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabUsageMultiple.java
@@ -60,7 +60,9 @@ public class TabUsageMultiple extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TabUsageMultiple";
+  private static final String OBJECT_TYPE_POST = "Uuid";
+  private static final String OBJECT_TYPE_PUT = "Uuid";
+  private static final String OBJECT_TYPE_GET = "TabUsageMultiple";
 
   /**
    * The uuid of the created TabUsageMultiple.
@@ -222,7 +224,7 @@ public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userI
   }
 
   /**
-   * Close a specific TabUsageMultiple. This request returns an empty response.
+   * Close a specific TabUsageMultiple.
    */
   public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId, String tabUsageMultipleUuid, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
@@ -242,7 +244,7 @@ public static BunqResponse<TabUsageMultiple> get(ApiContext apiContext, Integer
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, cashRegisterId, tabUsageMultipleUuid), new HashMap<>(), customHeaders);
 
-    return fromJson(TabUsageMultiple.class, responseRaw, OBJECT_TYPE);
+    return fromJson(TabUsageMultiple.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<TabUsageMultiple>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId) {
@@ -260,7 +262,7 @@ public static BunqResponse<List<TabUsageMultiple>> list(ApiContext apiContext, I
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, cashRegisterId), params, customHeaders);
 
-    return fromJsonList(TabUsageMultiple.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(TabUsageMultiple.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabUsageSingle.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabUsageSingle.java
index 4f098c14..d96f721b 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TabUsageSingle.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TabUsageSingle.java
@@ -61,7 +61,9 @@ public class TabUsageSingle extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TabUsageSingle";
+  private static final String OBJECT_TYPE_POST = "Uuid";
+  private static final String OBJECT_TYPE_PUT = "Uuid";
+  private static final String OBJECT_TYPE_GET = "TabUsageSingle";
 
   /**
    * The uuid of the created TabUsageSingle.
@@ -236,7 +238,7 @@ public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userI
   }
 
   /**
-   * Cancel a specific TabUsageSingle. This request returns an empty response.
+   * Cancel a specific TabUsageSingle.
    */
   public static BunqResponse<NullType> delete(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId, String tabUsageSingleUuid, Map<String, String> customHeaders) {
     ApiClient apiClient = new ApiClient(apiContext);
@@ -256,7 +258,7 @@ public static BunqResponse<TabUsageSingle> get(ApiContext apiContext, Integer us
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, monetaryAccountId, cashRegisterId, tabUsageSingleUuid), new HashMap<>(), customHeaders);
 
-    return fromJson(TabUsageSingle.class, responseRaw, OBJECT_TYPE);
+    return fromJson(TabUsageSingle.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<TabUsageSingle>> list(ApiContext apiContext, Integer userId, Integer monetaryAccountId, Integer cashRegisterId) {
@@ -274,7 +276,7 @@ public static BunqResponse<List<TabUsageSingle>> list(ApiContext apiContext, Int
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId, monetaryAccountId, cashRegisterId), params, customHeaders);
 
-    return fromJsonList(TabUsageSingle.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(TabUsageSingle.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/TokenQrRequestIdeal.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/TokenQrRequestIdeal.java
index 559a599d..30b398f3 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/TokenQrRequestIdeal.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/TokenQrRequestIdeal.java
@@ -44,7 +44,7 @@ public class TokenQrRequestIdeal extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "TokenQrRequestIdeal";
+  private static final String OBJECT_TYPE_POST = "RequestResponse";
 
   /**
    * The id of the RequestResponse.
@@ -208,7 +208,7 @@ public static BunqResponse<TokenQrRequestIdeal> create(ApiContext apiContext, Ma
     byte[] requestBytes = gson.toJson(requestMap).getBytes();
     BunqResponseRaw responseRaw = apiClient.post(String.format(ENDPOINT_URL_CREATE, userId), requestBytes, customHeaders);
 
-    return fromJson(TokenQrRequestIdeal.class, responseRaw, OBJECT_TYPE);
+    return fromJson(TokenQrRequestIdeal.class, responseRaw, OBJECT_TYPE_POST);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/User.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/User.java
index e768f520..bc8e8eb5 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/User.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/User.java
@@ -38,7 +38,7 @@ public class User extends BunqModel implements AnchorObjectInterface {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "User";
+  private static final String OBJECT_TYPE_GET = "User";
 
   /**
    */
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserCompany.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserCompany.java
index 46687431..314b0a6c 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserCompany.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserCompany.java
@@ -60,7 +60,7 @@ public class UserCompany extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "UserCompany";
+  private static final String OBJECT_TYPE_GET = "UserCompany";
 
   /**
    * The id of the modified company.
@@ -280,7 +280,7 @@ public static BunqResponse<UserCompany> get(ApiContext apiContext, Integer userC
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userCompanyId), new HashMap<>(), customHeaders);
 
-    return fromJson(UserCompany.class, responseRaw, OBJECT_TYPE);
+    return fromJson(UserCompany.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userCompanyId) {
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserCredentialPasswordIp.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserCredentialPasswordIp.java
index da4fe937..9713a559 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserCredentialPasswordIp.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserCredentialPasswordIp.java
@@ -33,7 +33,7 @@ public class UserCredentialPasswordIp extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "CredentialPasswordIp";
+  private static final String OBJECT_TYPE_GET = "CredentialPasswordIp";
 
   /**
    * The id of the credential.
@@ -94,7 +94,7 @@ public static BunqResponse<UserCredentialPasswordIp> get(ApiContext apiContext,
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userId, userCredentialPasswordIpId), new HashMap<>(), customHeaders);
 
-    return fromJson(UserCredentialPasswordIp.class, responseRaw, OBJECT_TYPE);
+    return fromJson(UserCredentialPasswordIp.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<List<UserCredentialPasswordIp>> list(ApiContext apiContext, Integer userId) {
@@ -111,7 +111,7 @@ public static BunqResponse<List<UserCredentialPasswordIp>> list(ApiContext apiCo
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_LISTING, userId), params, customHeaders);
 
-    return fromJsonList(UserCredentialPasswordIp.class, responseRaw, OBJECT_TYPE);
+    return fromJsonList(UserCredentialPasswordIp.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserLight.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserLight.java
index 6809a7ba..eec0dc0f 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserLight.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserLight.java
@@ -67,7 +67,7 @@ public class UserLight extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "UserPerson";
+  private static final String OBJECT_TYPE_GET = "UserPerson";
 
   /**
    * The id of the user.
@@ -308,7 +308,7 @@ public static BunqResponse<UserLight> get(ApiContext apiContext, Integer userLig
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userLightId), new HashMap<>(), customHeaders);
 
-    return fromJson(UserLight.class, responseRaw, OBJECT_TYPE);
+    return fromJson(UserLight.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   /**
diff --git a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserPerson.java b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserPerson.java
index 2aeb864d..192dca71 100644
--- a/src/main/java/com/bunq/sdk/model/generated/endpoint/UserPerson.java
+++ b/src/main/java/com/bunq/sdk/model/generated/endpoint/UserPerson.java
@@ -70,7 +70,7 @@ public class UserPerson extends BunqModel {
   /**
    * Object type.
    */
-  private static final String OBJECT_TYPE = "UserPerson";
+  private static final String OBJECT_TYPE_GET = "UserPerson";
 
   /**
    * The id of the modified person object.
@@ -305,7 +305,7 @@ public static BunqResponse<UserPerson> get(ApiContext apiContext, Integer userPe
     ApiClient apiClient = new ApiClient(apiContext);
     BunqResponseRaw responseRaw = apiClient.get(String.format(ENDPOINT_URL_READ, userPersonId), new HashMap<>(), customHeaders);
 
-    return fromJson(UserPerson.class, responseRaw, OBJECT_TYPE);
+    return fromJson(UserPerson.class, responseRaw, OBJECT_TYPE_GET);
   }
 
   public static BunqResponse<Integer> update(ApiContext apiContext, Map<String, Object> requestMap, Integer userPersonId) {