diff --git a/BunqSdk.Tests/Config.cs b/BunqSdk.Tests/Config.cs
index 72a8791..e695efa 100644
--- a/BunqSdk.Tests/Config.cs
+++ b/BunqSdk.Tests/Config.cs
@@ -51,14 +51,14 @@ public static PointerObject GetCounterPartyAliasSelf()
             return new PointerObject(type, alias);
         }
 
-        public static int GetSecondMonetaryAccountId()
+        public static long GetSecondMonetaryAccountId()
         {
-            return GetConfig()[FIELD_MONETARY_ACCOUNT_ID2].ToObject<int>();
+            return GetConfig()[FIELD_MONETARY_ACCOUNT_ID2].ToObject<long>();
         }
 
-        public static int GetMonetaryAccountId()
+        public static long GetMonetaryAccountId()
         {
-            return GetConfig()[FIELD_MONETARY_ACCOUNT_ID].ToObject<int>();
+            return GetConfig()[FIELD_MONETARY_ACCOUNT_ID].ToObject<long>();
         }
 
         public static string GetAttachmentPathIn()
@@ -90,9 +90,9 @@ public static string GetApiKey()
             return GetConfig()[FIELD_API_KEY].ToString();
         }
 
-        public static int GetUserId()
+        public static long GetUserId()
         {
-            return GetConfig()[FIELD_USER_ID].ToObject<int>();
+            return GetConfig()[FIELD_USER_ID].ToObject<long>();
         }
 
         private static JObject GetConfig()
diff --git a/BunqSdk.Tests/Context/Psd2ApiContextTest.cs b/BunqSdk.Tests/Context/Psd2ApiContextTest.cs
index 5d19c87..d223436 100644
--- a/BunqSdk.Tests/Context/Psd2ApiContextTest.cs
+++ b/BunqSdk.Tests/Context/Psd2ApiContextTest.cs
@@ -55,7 +55,7 @@ public void TestCreateOauthClient()
                 return;
             }
 
-            int clientId = OauthClientApiObject.Create().Value;
+            long clientId = OauthClientApiObject.Create().Value;
             OauthClientApiObject oauthClient = OauthClientApiObject.Get(clientId).Value;
             Assert.NotNull(oauthClient);
 
diff --git a/BunqSdk.Tests/Model/Generated/Endpoint/MonetaryAccountBankTest.cs b/BunqSdk.Tests/Model/Generated/Endpoint/MonetaryAccountBankTest.cs
index de8529e..64ec7ec 100644
--- a/BunqSdk.Tests/Model/Generated/Endpoint/MonetaryAccountBankTest.cs
+++ b/BunqSdk.Tests/Model/Generated/Endpoint/MonetaryAccountBankTest.cs
@@ -31,7 +31,7 @@ public void TestCreationNewMonetaryAccount()
             DeleteMonetaryAccount(monetaryAccountToCloseId);
         }
 
-        private static void DeleteMonetaryAccount(int idToClose)
+        private static void DeleteMonetaryAccount(long idToClose)
         {
             MonetaryAccountBankApiObject.Update(idToClose, status: Status, subStatus: SubStatus, reason: Reason,
                 reasonDescription: ReasonDescription);
diff --git a/BunqSdk/Context/ApiContext.cs b/BunqSdk/Context/ApiContext.cs
index 514705b..aeab466 100644
--- a/BunqSdk/Context/ApiContext.cs
+++ b/BunqSdk/Context/ApiContext.cs
@@ -46,7 +46,7 @@ public class ApiContext
         /// <summary>
         /// Dummy ID to pass to Session endpoint.
         /// </summary>
-        private const int SESSION_ID_DUMMY = 0;
+        private const long SESSION_ID_DUMMY = 0;
 
         /// <summary>
         /// Encoding of the serialized context.
diff --git a/BunqSdk/Context/SessionContext.cs b/BunqSdk/Context/SessionContext.cs
index 0389985..7ac59c6 100644
--- a/BunqSdk/Context/SessionContext.cs
+++ b/BunqSdk/Context/SessionContext.cs
@@ -38,7 +38,7 @@ public class SessionContext
         public DateTime ExpiryTime { get; private set; }
 
         [JsonProperty(PropertyName = "user_id")]
-        public int UserId { get; private set; }
+        public long UserId { get; private set; }
 
         [JsonProperty(PropertyName = "user_person")]
         public UserPersonApiObject UserPerson { get; private set; }
@@ -89,7 +89,7 @@ private void SetUser(BunqModel user)
             }
         }
 
-        private static int GetUserId(SessionServer sessionServer)
+        private static long GetUserId(SessionServer sessionServer)
         {
             if (sessionServer.UserCompany != null)
             {
@@ -155,7 +155,7 @@ private static double GetSessionTimeout(SessionServer sessionServer)
 
         private static double GetSessionTimeOutForUser(BunqModel user)
         {
-            int? sessionTimeout;
+            long? sessionTimeout;
 
             if (user.GetType() == typeof(UserPersonApiObject))
             {
@@ -177,7 +177,7 @@ private static double GetSessionTimeOutForUser(BunqModel user)
             return GetDoubleFromSessionTimeout(sessionTimeout);
         }
 
-        private static double GetDoubleFromSessionTimeout(int? sessionTimeout)
+        private static double GetDoubleFromSessionTimeout(long? sessionTimeout)
         {
             if (sessionTimeout == null)
             {
diff --git a/BunqSdk/Context/UserContext.cs b/BunqSdk/Context/UserContext.cs
index 7feb2a0..1869150 100644
--- a/BunqSdk/Context/UserContext.cs
+++ b/BunqSdk/Context/UserContext.cs
@@ -29,9 +29,9 @@ public MonetaryAccountBankApiObject PrimaryMonetaryAccountBank
             private set => primaryMonetaryAccountBank = value ?? throw new ArgumentNullException(nameof(value));
         }
 
-        public int UserId { get; }
+        public long UserId { get; }
 
-        public UserContext(int userId, BunqModel user)
+        public UserContext(long userId, BunqModel user)
         {
             UserId = userId;
             SetUser(user);
diff --git a/BunqSdk/Http/Pagination.cs b/BunqSdk/Http/Pagination.cs
index 3cf063d..f8e3416 100644
--- a/BunqSdk/Http/Pagination.cs
+++ b/BunqSdk/Http/Pagination.cs
@@ -20,10 +20,10 @@ public class Pagination
         public const string PARAM_FUTURE_ID = "future_id";
         public const string PARAM_COUNT = "count";
 
-        public int? OlderId { get; set; }
-        public int? NewerId { get; set; }
-        public int? FutureId { get; set; }
-        public int? Count { get; set; }
+        public long? OlderId { get; set; }
+        public long? NewerId { get; set; }
+        public long? FutureId { get; set; }
+        public long? Count { get; set; }
 
         /// <summary>
         /// Get the URL params required to request the next page of the listing.
@@ -58,7 +58,7 @@ private void AddCountToParamsIfNeeded(IDictionary<string, string> urlParams)
             }
         }
 
-        private int? NextId
+        private long? NextId
         {
             get { return HasNextPageAssured() ? NewerId : FutureId; }
         }
diff --git a/BunqSdk/Model/Core/BunqModel.cs b/BunqSdk/Model/Core/BunqModel.cs
index 975a9cc..5940d1f 100644
--- a/BunqSdk/Model/Core/BunqModel.cs
+++ b/BunqSdk/Model/Core/BunqModel.cs
@@ -39,15 +39,15 @@ protected static BunqResponse<T> FromJsonArrayNested<T>(BunqResponseRaw response
         }
 
         /// <summary>
-        /// De-serializes an ID object and returns its integer value.
+        /// De-serializes an ID object and returns its long value.
         /// </summary>
-        protected static BunqResponse<int> ProcessForId(BunqResponseRaw responseRaw)
+        protected static BunqResponse<long> ProcessForId(BunqResponseRaw responseRaw)
         {
             var responseItemObject = GetResponseItemObject(responseRaw);
             var unwrappedItemJsonString = GetUnwrappedItemJsonString(responseItemObject, FIELD_ID);
             var responseValue = BunqJsonConvert.DeserializeObject<Id>(unwrappedItemJsonString).IdInt;
 
-            return new BunqResponse<int>(responseValue, responseRaw.Headers);
+            return new BunqResponse<long>(responseValue, responseRaw.Headers);
         }
 
         private static JObject GetResponseItemObject(BunqResponseRaw responseRaw)
@@ -218,12 +218,12 @@ protected static ApiContext GetApiContext()
             return BunqContext.ApiContext;
         }
 
-        protected static int DetermineUserId()
+        protected static long DetermineUserId()
         {
             return BunqContext.UserContext.UserId;
         }
 
-        protected static int DetermineMonetaryAccountId(int? monetaryAccountId = null)
+        protected static long DetermineMonetaryAccountId(long? monetaryAccountId = null)
         {
             return monetaryAccountId ?? BunqContext.UserContext.PrimaryMonetaryAccountBank.Id.Value;
         }
diff --git a/BunqSdk/Model/Core/DeviceServerInternal.cs b/BunqSdk/Model/Core/DeviceServerInternal.cs
index e14d913..4f230d9 100644
--- a/BunqSdk/Model/Core/DeviceServerInternal.cs
+++ b/BunqSdk/Model/Core/DeviceServerInternal.cs
@@ -17,7 +17,7 @@ public class DeviceServerInternal : DeviceServerApiObject
         /// more at this link <a href="https://bunq.com/en/apikey-dynamic-ip"
         /// target="_blank">https://bunq.com/en/apikey-dynamic-ip</a>.
         /// </summary>
-        public static BunqResponse<int> Create(ApiContext apiContext, string description, string secret,
+        public static BunqResponse<long> Create(ApiContext apiContext, string description, string secret,
             List<string> permittedIps = null,
             IDictionary<string, string> customHeaders = null)
         {
diff --git a/BunqSdk/Model/Core/Id.cs b/BunqSdk/Model/Core/Id.cs
index 9e81013..e69bed1 100644
--- a/BunqSdk/Model/Core/Id.cs
+++ b/BunqSdk/Model/Core/Id.cs
@@ -4,9 +4,9 @@ namespace Bunq.Sdk.Model.Core
 {
     public class Id
     {
-        [JsonProperty(PropertyName = "id")] public int IdInt { get; private set; }
+        [JsonProperty(PropertyName = "id")] public long IdInt { get; private set; }
 
-        public Id(int idInt)
+        public Id(long idInt)
         {
             IdInt = idInt;
         }
diff --git a/BunqSdk/Model/Core/Installation.cs b/BunqSdk/Model/Core/Installation.cs
index 588b593..52f8eac 100644
--- a/BunqSdk/Model/Core/Installation.cs
+++ b/BunqSdk/Model/Core/Installation.cs
@@ -56,7 +56,7 @@ private static byte[] GenerateRequestBodyBytes(string publicKeyClientString)
             return Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(installationRequestBody));
         }
 
-        public int GetIdInt()
+        public long GetIdInt()
         {
             return id.IdInt;
         }
diff --git a/BunqSdk/Model/Core/NotificationFilterUrlMonetaryAccountInternal.cs b/BunqSdk/Model/Core/NotificationFilterUrlMonetaryAccountInternal.cs
index 16ed566..5e12ed5 100644
--- a/BunqSdk/Model/Core/NotificationFilterUrlMonetaryAccountInternal.cs
+++ b/BunqSdk/Model/Core/NotificationFilterUrlMonetaryAccountInternal.cs
@@ -27,7 +27,7 @@ public static BunqResponse<List<NotificationFilterUrlObject>> CreateWithListResp
         /// Create notification filters with list response type.
         /// </summary>
         public static BunqResponse<List<NotificationFilterUrlObject>> CreateWithListResponse(
-            int monetaryAccountId,
+            long monetaryAccountId,
             List<NotificationFilterUrlObject> allNotificationFilter
         )
         {
@@ -38,7 +38,7 @@ List<NotificationFilterUrlObject> allNotificationFilter
         /// Create notification filters with list response type.
         /// </summary>
         public static BunqResponse<List<NotificationFilterUrlObject>> CreateWithListResponse(
-            int? monetaryAccountId,
+            long? monetaryAccountId,
             List<NotificationFilterUrlObject> allNotificationFilter,
             Dictionary<string, string> customHeaders
         )
diff --git a/BunqSdk/Model/Generated/Endpoint/AdditionalTransactionInformationCategoryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/AdditionalTransactionInformationCategoryApiObject.cs
index f4ec929..493de87 100644
--- a/BunqSdk/Model/Generated/Endpoint/AdditionalTransactionInformationCategoryApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AdditionalTransactionInformationCategoryApiObject.cs
@@ -43,7 +43,7 @@ public class AdditionalTransactionInformationCategoryApiObject : BunqModel
         /// The sort order of the category.
         /// </summary>
         [JsonProperty(PropertyName = "order")]
-        public int? Order { get; set; }
+        public long? Order { get; set; }
         /// <summary>
         /// The description of the category.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/AdditionalTransactionInformationCategoryUserDefinedApiObject.cs b/BunqSdk/Model/Generated/Endpoint/AdditionalTransactionInformationCategoryUserDefinedApiObject.cs
index da0b3d7..0b7a15a 100644
--- a/BunqSdk/Model/Generated/Endpoint/AdditionalTransactionInformationCategoryUserDefinedApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AdditionalTransactionInformationCategoryUserDefinedApiObject.cs
@@ -62,7 +62,7 @@ public class AdditionalTransactionInformationCategoryUserDefinedApiObject : Bunq
         /// <param name="description">The description of the category.</param>
         /// <param name="color">The color of the category.</param>
         /// <param name="icon">The icon of the category.</param>
-        public static BunqResponse<int> Create(string status, string category = null, string description = null, string color = null, string icon = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string status, string category = null, string description = null, string color = null, string icon = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentConversationContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentConversationContentApiObject.cs
index 340bec3..b017e61 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentConversationContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentConversationContentApiObject.cs
@@ -28,7 +28,7 @@ public class AttachmentConversationContentApiObject : BunqModel
         /// <summary>
         /// Get the raw content of a specific attachment.
         /// </summary>
-        public static BunqResponse<byte[]> List(int chatConversationId, int attachmentId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long chatConversationId, long attachmentId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountApiObject.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountApiObject.cs
index db5343e..a0be495 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountApiObject.cs
@@ -31,7 +31,7 @@ public class AttachmentMonetaryAccountApiObject : BunqModel
         /// The ID of the attachment created.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
         /// <summary>
         /// Create a new monetary account attachment. Create a POST request with a payload that contains the binary
@@ -39,7 +39,7 @@ public class AttachmentMonetaryAccountApiObject : BunqModel
         /// in the Content-Type header. You are required to provide a description of the attachment using the
         /// X-Bunq-Attachment-Description header.
         /// </summary>
-        public static BunqResponse<int> Create(byte[] requestBytes, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(byte[] requestBytes, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountContentApiObject.cs
index d3e832f..fcdfea8 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountContentApiObject.cs
@@ -28,7 +28,7 @@ public class AttachmentMonetaryAccountContentApiObject : BunqModel
         /// <summary>
         /// Get the raw content of a specific attachment.
         /// </summary>
-        public static BunqResponse<byte[]> List(int attachmentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long attachmentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentUserApiObject.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentUserApiObject.cs
index 4f8a333..880f440 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentUserApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentUserApiObject.cs
@@ -30,7 +30,7 @@ public class AttachmentUserApiObject : BunqModel
         /// The id of the attachment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the attachment's creation.
         /// </summary>
@@ -50,7 +50,7 @@ public class AttachmentUserApiObject : BunqModel
         /// <summary>
         /// Get a specific attachment. The header of the response contains the content-type of the attachment.
         /// </summary>
-        public static BunqResponse<AttachmentUserApiObject> Get(int attachmentUserId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<AttachmentUserApiObject> Get(long attachmentUserId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentUserContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentUserContentApiObject.cs
index c4c3cbd..85a90c0 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentUserContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentUserContentApiObject.cs
@@ -28,7 +28,7 @@ public class AttachmentUserContentApiObject : BunqModel
         /// <summary>
         /// Get the raw content of a specific attachment.
         /// </summary>
-        public static BunqResponse<byte[]> List(int attachmentId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long attachmentId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncomingPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
index 4dd64b3..ab46836 100644
--- a/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
@@ -38,7 +38,7 @@ public class BankSwitchServiceNetherlandsIncomingPaymentApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<BankSwitchServiceNetherlandsIncomingPaymentApiObject> Get(int bankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BankSwitchServiceNetherlandsIncomingPaymentApiObject> Get(long bankSwitchServiceNetherlandsIncomingPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/BillingContractSubscriptionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/BillingContractSubscriptionApiObject.cs
index 240a524..81cf433 100644
--- a/BunqSdk/Model/Generated/Endpoint/BillingContractSubscriptionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BillingContractSubscriptionApiObject.cs
@@ -39,7 +39,7 @@ public class BillingContractSubscriptionApiObject : BunqModel
         /// The id of the billing contract.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the billing contract was made.
         /// </summary>
@@ -64,7 +64,7 @@ public class BillingContractSubscriptionApiObject : BunqModel
         /// The version of the billing contract.
         /// </summary>
         [JsonProperty(PropertyName = "contract_version")]
-        public int? ContractVersion { get; set; }
+        public long? ContractVersion { get; set; }
         /// <summary>
         /// The subscription type the user will have after a subscription downgrade. Will be null if downgrading is not
         /// possible.
diff --git a/BunqSdk/Model/Generated/Endpoint/BirdeeInvestmentPortfolioApiObject.cs b/BunqSdk/Model/Generated/Endpoint/BirdeeInvestmentPortfolioApiObject.cs
index e7987ee..af06862 100644
--- a/BunqSdk/Model/Generated/Endpoint/BirdeeInvestmentPortfolioApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BirdeeInvestmentPortfolioApiObject.cs
@@ -48,12 +48,12 @@ public class BirdeeInvestmentPortfolioApiObject : BunqModel
         /// Maximum number of strategy changes in a year.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_strategy_change_annual_maximum")]
-        public int? NumberOfStrategyChangeAnnualMaximum { get; set; }
+        public long? NumberOfStrategyChangeAnnualMaximum { get; set; }
         /// <summary>
         /// Maximum number of strategy changes used.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_strategy_change_annual_used")]
-        public int? NumberOfStrategyChangeAnnualUsed { get; set; }
+        public long? NumberOfStrategyChangeAnnualUsed { get; set; }
         /// <summary>
         /// The external identifier of the portfolio.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfileUserApiObject.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfileUserApiObject.cs
index 766f4b5..5c05999 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfileUserApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfileUserApiObject.cs
@@ -41,7 +41,7 @@ public class BunqMeFundraiserProfileUserApiObject : BunqModel
         /// Id of the monetary account on which you want to receive bunq.me payments.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The color chosen for the bunq.me fundraiser profile in hexadecimal format.
         /// </summary>
@@ -76,7 +76,7 @@ public class BunqMeFundraiserProfileUserApiObject : BunqModel
         /// Id of the user owning the profile.
         /// </summary>
         [JsonProperty(PropertyName = "owner_user_id")]
-        public int? OwnerUserId { get; set; }
+        public long? OwnerUserId { get; set; }
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the User and the MonetaryAccount that created the
         /// bunq.me fundraiser profile.
@@ -96,7 +96,7 @@ public class BunqMeFundraiserProfileUserApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<BunqMeFundraiserProfileUserApiObject> Get(int bunqMeFundraiserProfileUserId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BunqMeFundraiserProfileUserApiObject> Get(long bunqMeFundraiserProfileUserId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserResultApiObject.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserResultApiObject.cs
index 4e18225..62758e8 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserResultApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserResultApiObject.cs
@@ -28,7 +28,7 @@ public class BunqMeFundraiserResultApiObject : BunqModel
         /// The id of the bunq.me.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the bunq.me was created.
         /// </summary>
@@ -52,7 +52,7 @@ public class BunqMeFundraiserResultApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<BunqMeFundraiserResultApiObject> Get(int bunqMeFundraiserResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BunqMeFundraiserResultApiObject> Get(long bunqMeFundraiserResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeTabApiObject.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeTabApiObject.cs
index b6ff7db..0f846aa 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeTabApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeTabApiObject.cs
@@ -50,12 +50,12 @@ public class BunqMeTabApiObject : BunqModel
         /// The ID of the related event if the bunqMeTab made by 'split' functionality.
         /// </summary>
         [JsonProperty(PropertyName = "event_id")]
-        public int? EventId { get; set; }
+        public long? EventId { get; set; }
         /// <summary>
         /// The id of the created bunq.me.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the bunq.me was created.
         /// </summary>
@@ -75,7 +75,7 @@ public class BunqMeTabApiObject : BunqModel
         /// The id of the MonetaryAccount the bunq.me was sent from.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The type of the bunq.me Tab. Should be BUNQ_ME
         /// </summary>
@@ -108,7 +108,7 @@ public class BunqMeTabApiObject : BunqModel
         /// <param name="bunqmeTabEntry">The bunq.me entry containing the payment information.</param>
         /// <param name="status">The status of the bunq.me. Ignored in POST requests but can be used for cancelling the bunq.me by setting status as CANCELLED with a PUT request.</param>
         /// <param name="eventId">The ID of the related event if the bunqMeTab made by 'split' functionality.</param>
-        public static BunqResponse<int> Create(BunqMeTabEntryApiObject bunqmeTabEntry, int? monetaryAccountId= null, string status = null, int? eventId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(BunqMeTabEntryApiObject bunqmeTabEntry, long? monetaryAccountId= null, string status = null, long? eventId = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -130,7 +130,7 @@ public static BunqResponse<int> Create(BunqMeTabEntryApiObject bunqmeTabEntry, i
         /// <summary>
         /// </summary>
         /// <param name="status">The status of the bunq.me. Ignored in POST requests but can be used for cancelling the bunq.me by setting status as CANCELLED with a PUT request.</param>
-        public static BunqResponse<int> Update(int bunqMeTabId, int? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long bunqMeTabId, long? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -149,7 +149,7 @@ public static BunqResponse<int> Update(int bunqMeTabId, int? monetaryAccountId=
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<BunqMeTabApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<BunqMeTabApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -162,7 +162,7 @@ public static BunqResponse<List<BunqMeTabApiObject>> List(int? monetaryAccountId
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<BunqMeTabApiObject> Get(int bunqMeTabId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BunqMeTabApiObject> Get(long bunqMeTabId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultInquiryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultInquiryApiObject.cs
index ab8a7f1..38c1896 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultInquiryApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultInquiryApiObject.cs
@@ -19,7 +19,7 @@ public class BunqMeTabResultInquiryApiObject : BunqModel
         /// The Id of the bunq.me tab that this BunqMeTabResultInquiry belongs to.
         /// </summary>
         [JsonProperty(PropertyName = "bunq_me_tab_id")]
-        public int? BunqMeTabId { get; set; }
+        public long? BunqMeTabId { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultResponseApiObject.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultResponseApiObject.cs
index 09ff257..33e66cd 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultResponseApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultResponseApiObject.cs
@@ -33,7 +33,7 @@ public class BunqMeTabResultResponseApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<BunqMeTabResultResponseApiObject> Get(int bunqMeTabResultResponseId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BunqMeTabResultResponseApiObject> Get(long bunqMeTabResultResponseId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CardApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CardApiObject.cs
index 2caa5a3..3e95939 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardApiObject.cs
@@ -99,7 +99,7 @@ public class CardApiObject : BunqModel
         /// not supplied.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id_fallback")]
-        public int? MonetaryAccountIdFallback { get; set; }
+        public long? MonetaryAccountIdFallback { get; set; }
         /// <summary>
         /// The user's preferred name on the card.
         /// </summary>
@@ -119,7 +119,7 @@ public class CardApiObject : BunqModel
         /// The id of the card.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the card's creation.
         /// </summary>
@@ -139,17 +139,17 @@ public class CardApiObject : BunqModel
         /// DEPRECATED. ID of the user who is owner of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// ID of the user who is owner of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_owner_id")]
-        public int? UserOwnerId { get; set; }
+        public long? UserOwnerId { get; set; }
         /// <summary>
         /// ID of the user who is holder of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_holder_id")]
-        public int? UserHolderId { get; set; }
+        public long? UserHolderId { get; set; }
         /// <summary>
         /// The type of the card. Can be MAESTRO, MASTERCARD.
         /// </summary>
@@ -269,7 +269,7 @@ public class CardApiObject : BunqModel
         /// <param name="preferredNameOnCard">The user's preferred name as it will be on the card.</param>
         /// <param name="secondLine">The second line of text on the card</param>
         /// <param name="cancellationReason">The reason for card cancellation.</param>
-        public static BunqResponse<CardApiObject> Update(int cardId, string pinCode = null, string activationCode = null, string status = null, string orderStatus = null, AmountObject cardLimit = null, AmountObject cardLimitAtm = null, List<CardCountryPermissionObject> countryPermission = null, List<CardPinAssignmentObject> pinCodeAssignment = null, List<CardPrimaryAccountNumberObject> primaryAccountNumbers = null, int? monetaryAccountIdFallback = null, string preferredNameOnCard = null, string secondLine = null, string cancellationReason = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CardApiObject> Update(long cardId, string pinCode = null, string activationCode = null, string status = null, string orderStatus = null, AmountObject cardLimit = null, AmountObject cardLimitAtm = null, List<CardCountryPermissionObject> countryPermission = null, List<CardPinAssignmentObject> pinCodeAssignment = null, List<CardPrimaryAccountNumberObject> primaryAccountNumbers = null, long? monetaryAccountIdFallback = null, string preferredNameOnCard = null, string secondLine = null, string cancellationReason = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -301,7 +301,7 @@ public static BunqResponse<CardApiObject> Update(int cardId, string pinCode = nu
         /// <summary>
         /// Return the details of a specific card.
         /// </summary>
-        public static BunqResponse<CardApiObject> Get(int cardId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CardApiObject> Get(long cardId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CardCreditApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CardCreditApiObject.cs
index 1da4bab..80227b7 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardCreditApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardCreditApiObject.cs
@@ -86,7 +86,7 @@ public class CardCreditApiObject : BunqModel
         /// not supplied.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id_fallback")]
-        public int? MonetaryAccountIdFallback { get; set; }
+        public long? MonetaryAccountIdFallback { get; set; }
         /// <summary>
         /// The order status of the card. Can be NEW_CARD_REQUEST_RECEIVED, CARD_REQUEST_PENDING, SENT_FOR_PRODUCTION,
         /// ACCEPTED_FOR_PRODUCTION, DELIVERED_TO_CUSTOMER, CARD_UPDATE_REQUESTED, CARD_UPDATE_PENDING,
@@ -99,7 +99,7 @@ public class CardCreditApiObject : BunqModel
         /// The id of the card.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the card's creation.
         /// </summary>
@@ -119,17 +119,17 @@ public class CardCreditApiObject : BunqModel
         /// DEPRECATED. ID of the user who is owner of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// ID of the user who is owner of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_owner_id")]
-        public int? UserOwnerId { get; set; }
+        public long? UserOwnerId { get; set; }
         /// <summary>
         /// ID of the user who is holder of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_holder_id")]
-        public int? UserHolderId { get; set; }
+        public long? UserHolderId { get; set; }
         /// <summary>
         /// The sub-type of the card.
         /// </summary>
@@ -250,7 +250,7 @@ public class CardCreditApiObject : BunqModel
         /// <param name="pinCodeAssignment">Array of Types, PINs, account IDs assigned to the card.</param>
         /// <param name="monetaryAccountIdFallback">ID of the MA to be used as fallback for this card if insufficient balance. Fallback account is removed if not supplied.</param>
         /// <param name="orderStatus">The order status of this card. Can be CARD_REQUEST_PENDING or VIRTUAL_DELIVERY.</param>
-        public static BunqResponse<CardCreditApiObject> Create(string secondLine, string nameOnCard, string type, string productType, string firstLine = null, string preferredNameOnCard = null, PointerObject alias = null, List<CardPinAssignmentObject> pinCodeAssignment = null, int? monetaryAccountIdFallback = null, string orderStatus = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CardCreditApiObject> Create(string secondLine, string nameOnCard, string type, string productType, string firstLine = null, string preferredNameOnCard = null, PointerObject alias = null, List<CardPinAssignmentObject> pinCodeAssignment = null, long? monetaryAccountIdFallback = null, string orderStatus = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CardDebitApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CardDebitApiObject.cs
index e5bd14a..adf808d 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardDebitApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardDebitApiObject.cs
@@ -80,7 +80,7 @@ public class CardDebitApiObject : BunqModel
         /// not supplied.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id_fallback")]
-        public int? MonetaryAccountIdFallback { get; set; }
+        public long? MonetaryAccountIdFallback { get; set; }
         /// <summary>
         /// The order status of the card. Can be NEW_CARD_REQUEST_RECEIVED, CARD_REQUEST_PENDING, SENT_FOR_PRODUCTION,
         /// ACCEPTED_FOR_PRODUCTION, DELIVERED_TO_CUSTOMER, CARD_UPDATE_REQUESTED, CARD_UPDATE_PENDING,
@@ -93,7 +93,7 @@ public class CardDebitApiObject : BunqModel
         /// The id of the card.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the card's creation.
         /// </summary>
@@ -113,17 +113,17 @@ public class CardDebitApiObject : BunqModel
         /// DEPRECATED. ID of the user who is owner of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// ID of the user who is owner of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_owner_id")]
-        public int? UserOwnerId { get; set; }
+        public long? UserOwnerId { get; set; }
         /// <summary>
         /// ID of the user who is holder of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_holder_id")]
-        public int? UserHolderId { get; set; }
+        public long? UserHolderId { get; set; }
         /// <summary>
         /// The sub-type of the card.
         /// </summary>
@@ -248,7 +248,7 @@ public class CardDebitApiObject : BunqModel
         /// <param name="pinCodeAssignment">Array of Types, PINs, account IDs assigned to the card.</param>
         /// <param name="monetaryAccountIdFallback">ID of the MA to be used as fallback for this card if insufficient balance. Fallback account is removed if not supplied.</param>
         /// <param name="orderStatus">The order status of this card. Can be CARD_REQUEST_PENDING or VIRTUAL_DELIVERY.</param>
-        public static BunqResponse<CardDebitApiObject> Create(string secondLine, string nameOnCard, string type, string productType, string preferredNameOnCard = null, PointerObject alias = null, List<CardPinAssignmentObject> pinCodeAssignment = null, int? monetaryAccountIdFallback = null, string orderStatus = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CardDebitApiObject> Create(string secondLine, string nameOnCard, string type, string productType, string preferredNameOnCard = null, PointerObject alias = null, List<CardPinAssignmentObject> pinCodeAssignment = null, long? monetaryAccountIdFallback = null, string orderStatus = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CardGeneratedCvc2ApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CardGeneratedCvc2ApiObject.cs
index c4a9e2e..839763a 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardGeneratedCvc2ApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardGeneratedCvc2ApiObject.cs
@@ -41,7 +41,7 @@ public class CardGeneratedCvc2ApiObject : BunqModel
         /// The id of the cvc code.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the cvc code's creation.
         /// </summary>
@@ -72,7 +72,7 @@ public class CardGeneratedCvc2ApiObject : BunqModel
         /// Generate a new CVC2 code for a card.
         /// </summary>
         /// <param name="type">The type of generated cvc2. Can be STATIC or GENERATED.</param>
-        public static BunqResponse<int> Create(int cardId, string type = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long cardId, string type = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -92,7 +92,7 @@ public static BunqResponse<int> Create(int cardId, string type = null, IDictiona
         /// <summary>
         /// Get the details for a specific generated CVC2 code.
         /// </summary>
-        public static BunqResponse<CardGeneratedCvc2ApiObject> Get(int cardId, int cardGeneratedCvc2Id, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CardGeneratedCvc2ApiObject> Get(long cardId, long cardGeneratedCvc2Id, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -105,7 +105,7 @@ public static BunqResponse<CardGeneratedCvc2ApiObject> Get(int cardId, int cardG
         /// <summary>
         /// </summary>
         /// <param name="type">The type of generated cvc2. Can be STATIC or GENERATED.</param>
-        public static BunqResponse<int> Update(int cardId, int cardGeneratedCvc2Id, string type = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long cardId, long cardGeneratedCvc2Id, string type = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -125,7 +125,7 @@ public static BunqResponse<int> Update(int cardId, int cardGeneratedCvc2Id, stri
         /// <summary>
         /// Get all generated CVC2 codes for a card.
         /// </summary>
-        public static BunqResponse<List<CardGeneratedCvc2ApiObject>> List(int cardId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<CardGeneratedCvc2ApiObject>> List(long cardId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/CardReplaceApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CardReplaceApiObject.cs
index 06bbd1c..7ca4ae5 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardReplaceApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardReplaceApiObject.cs
@@ -56,7 +56,7 @@ public class CardReplaceApiObject : BunqModel
         /// The id of the new card.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
         /// <summary>
         /// Request a card replacement.
@@ -65,7 +65,7 @@ public class CardReplaceApiObject : BunqModel
         /// <param name="preferredNameOnCard">The user's preferred name that can be put on the card.</param>
         /// <param name="pinCodeAssignment">Array of Types, PINs, account IDs assigned to the card.</param>
         /// <param name="secondLine">The second line on the card.</param>
-        public static BunqResponse<int> Create(int cardId, string nameOnCard = null, string preferredNameOnCard = null, List<CardPinAssignmentObject> pinCodeAssignment = null, string secondLine = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long cardId, string nameOnCard = null, string preferredNameOnCard = null, List<CardPinAssignmentObject> pinCodeAssignment = null, string secondLine = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CardReplacementApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CardReplacementApiObject.cs
index b2f4dc0..ef1f930 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardReplacementApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardReplacementApiObject.cs
@@ -37,12 +37,12 @@ public class CardReplacementApiObject : BunqModel
         /// The original card that belongs to the CardReplacement.
         /// </summary>
         [JsonProperty(PropertyName = "card_id")]
-        public int? CardId { get; set; }
+        public long? CardId { get; set; }
         /// <summary>
         /// The new card that replaces the original card in the CardReplacement.
         /// </summary>
         [JsonProperty(PropertyName = "card_new_id")]
-        public int? CardNewId { get; set; }
+        public long? CardNewId { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/CertificatePinnedApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CertificatePinnedApiObject.cs
index fbafb3b..6417398 100644
--- a/BunqSdk/Model/Generated/Endpoint/CertificatePinnedApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CertificatePinnedApiObject.cs
@@ -43,13 +43,13 @@ public class CertificatePinnedApiObject : BunqModel
         /// The id generated for the pinned certificate chain.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
         /// <summary>
         /// Pin the certificate chain.
         /// </summary>
         /// <param name="certificateChain">The certificate chain in .PEM format.</param>
-        public static BunqResponse<int> Create(List<CertificateObject> certificateChain, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(List<CertificateObject> certificateChain, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -69,7 +69,7 @@ public static BunqResponse<int> Create(List<CertificateObject> certificateChain,
         /// <summary>
         /// Remove the pinned certificate chain with the specific ID.
         /// </summary>
-        public static BunqResponse<object> Delete(int certificatePinnedId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long certificatePinnedId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<List<CertificatePinnedApiObject>> List( IDictionary<s
         /// <summary>
         /// Get the pinned certificate chain with the specified ID.
         /// </summary>
-        public static BunqResponse<CertificatePinnedApiObject> Get(int certificatePinnedId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CertificatePinnedApiObject> Get(long certificatePinnedId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CoOwnerInviteResponseApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CoOwnerInviteResponseApiObject.cs
index 6387f00..9eb6546 100644
--- a/BunqSdk/Model/Generated/Endpoint/CoOwnerInviteResponseApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CoOwnerInviteResponseApiObject.cs
@@ -36,7 +36,7 @@ public class CoOwnerInviteResponseApiObject : BunqModel
         /// The ID of the monetaryAccount
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The extension type of the monetaryAccount
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/CompanyApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CompanyApiObject.cs
index 095d013..82cfc64 100644
--- a/BunqSdk/Model/Generated/Endpoint/CompanyApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CompanyApiObject.cs
@@ -123,7 +123,7 @@ public class CompanyApiObject : BunqModel
         /// <param name="vatNumber">DEPRECATED All the vat numbers of the company</param>
         /// <param name="vatNumbers">All the vat numbers of the company</param>
         /// <param name="signupTrackType">The type of signup track the user is following.</param>
-        public static BunqResponse<int> Create(string name, AddressObject addressMain, AddressObject addressPostal, string country, string legalForm, string subscriptionType, List<UboObject> ubo = null, string chamberOfCommerceNumber = null, string avatarUuid = null, CompanyVatNumberObject vatNumber = null, List<CompanyVatNumberObject> vatNumbers = null, string signupTrackType = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string name, AddressObject addressMain, AddressObject addressPostal, string country, string legalForm, string subscriptionType, List<UboObject> ubo = null, string chamberOfCommerceNumber = null, string avatarUuid = null, CompanyVatNumberObject vatNumber = null, List<CompanyVatNumberObject> vatNumbers = null, string signupTrackType = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -153,7 +153,7 @@ public static BunqResponse<int> Create(string name, AddressObject addressMain, A
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<CompanyApiObject> Get(int companyId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CompanyApiObject> Get(long companyId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -179,7 +179,7 @@ public static BunqResponse<List<CompanyApiObject>> List( IDictionary<string, str
         /// <summary>
         /// </summary>
         /// <param name="avatarUuid">The public UUID of the company's avatar.</param>
-        public static BunqResponse<int> Update(int companyId, string avatarUuid = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long companyId, string avatarUuid = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeCardApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeCardApiObject.cs
index 683e521..d266b47 100644
--- a/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeCardApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeCardApiObject.cs
@@ -83,7 +83,7 @@ public class CompanyEmployeeCardApiObject : BunqModel
         /// The number of transactions that still need a receipt.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_company_employee_card_receipt_pending")]
-        public int? NumberOfCompanyEmployeeCardReceiptPending { get; set; }
+        public long? NumberOfCompanyEmployeeCardReceiptPending { get; set; }
         /// <summary>
         /// The company employee's monthly cumulative card limit.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeCardLimitApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeCardLimitApiObject.cs
index 1d872aa..b667d24 100644
--- a/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeCardLimitApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeCardLimitApiObject.cs
@@ -25,12 +25,12 @@ public class CompanyEmployeeCardLimitApiObject : BunqModel
         /// Company item id.
         /// </summary>
         [JsonProperty(PropertyName = "user_company_id")]
-        public int? UserCompanyId { get; set; }
+        public long? UserCompanyId { get; set; }
         /// <summary>
         /// Company employee item id.
         /// </summary>
         [JsonProperty(PropertyName = "user_employee_id")]
-        public int? UserEmployeeId { get; set; }
+        public long? UserEmployeeId { get; set; }
         /// <summary>
         /// The monthly spend for this employee on the card.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeSettingAdyenCardTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeSettingAdyenCardTransactionApiObject.cs
index a25a0a7..a326cbc 100644
--- a/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeSettingAdyenCardTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CompanyEmployeeSettingAdyenCardTransactionApiObject.cs
@@ -46,11 +46,11 @@ public class CompanyEmployeeSettingAdyenCardTransactionApiObject : BunqModel
         /// The ID of the monetary account where Tap to Pay transactions should be paid out to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_payout_id")]
-        public int? MonetaryAccountPayoutId { get; set; }
+        public long? MonetaryAccountPayoutId { get; set; }
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<CompanyEmployeeSettingAdyenCardTransactionApiObject> Get(int companyEmployeeSettingAdyenCardTransactionId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CompanyEmployeeSettingAdyenCardTransactionApiObject> Get(long companyEmployeeSettingAdyenCardTransactionId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CurrencyCloudBeneficiaryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CurrencyCloudBeneficiaryApiObject.cs
index 620c8f3..798bd2f 100644
--- a/BunqSdk/Model/Generated/Endpoint/CurrencyCloudBeneficiaryApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CurrencyCloudBeneficiaryApiObject.cs
@@ -71,7 +71,7 @@ public class CurrencyCloudBeneficiaryApiObject : BunqModel
         /// The id of the profile.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the beneficiaries creation.
         /// </summary>
@@ -101,7 +101,7 @@ public class CurrencyCloudBeneficiaryApiObject : BunqModel
         /// <param name="paymentType">The payment type this requirement is for.</param>
         /// <param name="legalEntityType">The legal entity type of the beneficiary.</param>
         /// <param name="allField">All fields that were required by CurrencyCloud. Obtained through the CurrencyCloudBeneficiaryRequirement listing.</param>
-        public static BunqResponse<int> Create(string name, string country, string currency, string paymentType, string legalEntityType, List<string> allField, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string name, string country, string currency, string paymentType, string legalEntityType, List<string> allField, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -125,7 +125,7 @@ public static BunqResponse<int> Create(string name, string country, string curre
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<CurrencyCloudBeneficiaryApiObject> Get(int currencyCloudBeneficiaryId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CurrencyCloudBeneficiaryApiObject> Get(long currencyCloudBeneficiaryId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CurrencyCloudPaymentQuoteApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CurrencyCloudPaymentQuoteApiObject.cs
index 6d6377d..66ee121 100644
--- a/BunqSdk/Model/Generated/Endpoint/CurrencyCloudPaymentQuoteApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CurrencyCloudPaymentQuoteApiObject.cs
@@ -40,7 +40,7 @@ public class CurrencyCloudPaymentQuoteApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="pointers">The points we want to know the fees for.</param>
-        public static BunqResponse<int> Create(List<PointerObject> pointers, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(List<PointerObject> pointers, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CurrencyConversionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CurrencyConversionApiObject.cs
index e3442bd..9134bd7 100644
--- a/BunqSdk/Model/Generated/Endpoint/CurrencyConversionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CurrencyConversionApiObject.cs
@@ -30,7 +30,7 @@ public class CurrencyConversionApiObject : BunqModel
         /// The id of the conversion.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the conversion's creation.
         /// </summary>
@@ -99,7 +99,7 @@ public class CurrencyConversionApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<CurrencyConversionApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<CurrencyConversionApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -112,7 +112,7 @@ public static BunqResponse<List<CurrencyConversionApiObject>> List(int? monetary
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<CurrencyConversionApiObject> Get(int currencyConversionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CurrencyConversionApiObject> Get(long currencyConversionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CurrencyConversionQuoteApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CurrencyConversionQuoteApiObject.cs
index ffc4c5f..393b35d 100644
--- a/BunqSdk/Model/Generated/Endpoint/CurrencyConversionQuoteApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CurrencyConversionQuoteApiObject.cs
@@ -72,7 +72,7 @@ public class CurrencyConversionQuoteApiObject : BunqModel
         /// The id of the quote.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the quote's creation.
         /// </summary>
@@ -112,7 +112,7 @@ public class CurrencyConversionQuoteApiObject : BunqModel
         /// <param name="orderType">The type of the quote, SELL or BUY.</param>
         /// <param name="counterpartyAlias">The Alias of the party we are transferring the money to.</param>
         /// <param name="status">The status of the quote.</param>
-        public static BunqResponse<int> Create(AmountObject amount, string currencySource, string currencyTarget, string orderType, PointerObject counterpartyAlias, int? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(AmountObject amount, string currencySource, string currencyTarget, string orderType, PointerObject counterpartyAlias, long? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -136,7 +136,7 @@ public static BunqResponse<int> Create(AmountObject amount, string currencySourc
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<CurrencyConversionQuoteApiObject> Get(int currencyConversionQuoteId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CurrencyConversionQuoteApiObject> Get(long currencyConversionQuoteId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -149,7 +149,7 @@ public static BunqResponse<CurrencyConversionQuoteApiObject> Get(int currencyCon
         /// <summary>
         /// </summary>
         /// <param name="status">The status of the quote.</param>
-        public static BunqResponse<CurrencyConversionQuoteApiObject> Update(int currencyConversionQuoteId, int? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CurrencyConversionQuoteApiObject> Update(long currencyConversionQuoteId, long? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/CustomerApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CustomerApiObject.cs
index d41459a..5ad0cba 100644
--- a/BunqSdk/Model/Generated/Endpoint/CustomerApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CustomerApiObject.cs
@@ -30,7 +30,7 @@ public class CustomerApiObject : BunqModel
         /// The id of the customer.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the customer object's creation.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/CustomerLimitApiObject.cs b/BunqSdk/Model/Generated/Endpoint/CustomerLimitApiObject.cs
index 6d7a67e..78e4bb6 100644
--- a/BunqSdk/Model/Generated/Endpoint/CustomerLimitApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CustomerLimitApiObject.cs
@@ -29,37 +29,37 @@ public class CustomerLimitApiObject : BunqModel
         /// The limit of monetary accounts.
         /// </summary>
         [JsonProperty(PropertyName = "limit_monetary_account")]
-        public int? LimitMonetaryAccount { get; set; }
+        public long? LimitMonetaryAccount { get; set; }
         /// <summary>
         /// The amount of additional monetary accounts you can create.
         /// </summary>
         [JsonProperty(PropertyName = "limit_monetary_account_remaining")]
-        public int? LimitMonetaryAccountRemaining { get; set; }
+        public long? LimitMonetaryAccountRemaining { get; set; }
         /// <summary>
         /// The limit of Maestro cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_debit_maestro")]
-        public int? LimitCardDebitMaestro { get; set; }
+        public long? LimitCardDebitMaestro { get; set; }
         /// <summary>
         /// The limit of MasterCard cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_debit_mastercard")]
-        public int? LimitCardDebitMastercard { get; set; }
+        public long? LimitCardDebitMastercard { get; set; }
         /// <summary>
         /// DEPRECTATED: The limit of wildcards, e.g. Maestro or MasterCard cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_debit_wildcard")]
-        public int? LimitCardDebitWildcard { get; set; }
+        public long? LimitCardDebitWildcard { get; set; }
         /// <summary>
         /// The limit of wildcards, e.g. Maestro or MasterCard cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_wildcard")]
-        public int? LimitCardWildcard { get; set; }
+        public long? LimitCardWildcard { get; set; }
         /// <summary>
         /// The limit of free replacement cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_replacement")]
-        public int? LimitCardReplacement { get; set; }
+        public long? LimitCardReplacement { get; set; }
         /// <summary>
         /// The maximum amount a user is allowed to spend in a month.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/DeviceApiObject.cs b/BunqSdk/Model/Generated/Endpoint/DeviceApiObject.cs
index bff5e88..37579d3 100644
--- a/BunqSdk/Model/Generated/Endpoint/DeviceApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/DeviceApiObject.cs
@@ -39,7 +39,7 @@ public class DeviceApiObject : BunqModel, IAnchorObjectInterface
         /// <summary>
         /// Get a single Device. A Device is either a DevicePhone or a DeviceServer.
         /// </summary>
-        public static BunqResponse<DeviceApiObject> Get(int deviceId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<DeviceApiObject> Get(long deviceId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/DeviceServerApiObject.cs b/BunqSdk/Model/Generated/Endpoint/DeviceServerApiObject.cs
index 1e8a534..f4f200a 100644
--- a/BunqSdk/Model/Generated/Endpoint/DeviceServerApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/DeviceServerApiObject.cs
@@ -54,7 +54,7 @@ public class DeviceServerApiObject : BunqModel
         /// The id of the DeviceServer as created on the server.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the DeviceServer's creation.
         /// </summary>
@@ -87,7 +87,7 @@ public class DeviceServerApiObject : BunqModel
         /// <param name="description">The description of the DeviceServer. This is only for your own reference when reading the DeviceServer again.</param>
         /// <param name="secret">The API key. You can request an API key in the bunq app.</param>
         /// <param name="permittedIps">An array of IPs (v4 or v6) this DeviceServer will be able to do calls from. These will be linked to the API key.</param>
-        public static BunqResponse<int> Create(string description, string secret, List<string> permittedIps = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string description, string secret, List<string> permittedIps = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -109,7 +109,7 @@ public static BunqResponse<int> Create(string description, string secret, List<s
         /// <summary>
         /// Get one of your DeviceServers.
         /// </summary>
-        public static BunqResponse<DeviceServerApiObject> Get(int deviceServerId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<DeviceServerApiObject> Get(long deviceServerId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/DraftPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/DraftPaymentApiObject.cs
index 387c47b..02151d6 100644
--- a/BunqSdk/Model/Generated/Endpoint/DraftPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/DraftPaymentApiObject.cs
@@ -32,6 +32,7 @@ public class DraftPaymentApiObject : BunqModel
         public const string FIELD_PREVIOUS_UPDATED_TIMESTAMP = "previous_updated_timestamp";
         public const string FIELD_NUMBER_OF_REQUIRED_ACCEPTS = "number_of_required_accepts";
         public const string FIELD_SCHEDULE = "schedule";
+        public const string FIELD_PAYMENT_BATCH_EXECUTION_TYPE = "payment_batch_execution_type";
     
         /// <summary>
         /// Object type.
@@ -59,22 +60,27 @@ public class DraftPaymentApiObject : BunqModel
         /// is valid.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_required_accepts")]
-        public int? NumberOfRequiredAccepts { get; set; }
+        public long? NumberOfRequiredAccepts { get; set; }
         /// <summary>
         /// The schedule details.
         /// </summary>
         [JsonProperty(PropertyName = "schedule")]
         public ScheduleApiObject Schedule { get; set; }
         /// <summary>
+        /// The execution type that will be used when converting this draft payment to a payment batch.
+        /// </summary>
+        [JsonProperty(PropertyName = "payment_batch_execution_type")]
+        public string PaymentBatchExecutionType { get; set; }
+        /// <summary>
         /// The id of the created DrafPayment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The id of the MonetaryAccount the DraftPayment applies to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The label of the User who created the DraftPayment.
         /// </summary>
@@ -109,7 +115,8 @@ public class DraftPaymentApiObject : BunqModel
         /// <param name="status">The status of the DraftPayment.</param>
         /// <param name="previousUpdatedTimestamp">The last updated_timestamp that you received for this DraftPayment. This needs to be provided to prevent race conditions.</param>
         /// <param name="schedule">The schedule details when creating or updating a scheduled payment.</param>
-        public static BunqResponse<int> Create(List<DraftPaymentEntryObject> entries, int? numberOfRequiredAccepts, int? monetaryAccountId= null, string status = null, string previousUpdatedTimestamp = null, ScheduleApiObject schedule = null, IDictionary<string, string> customHeaders = null)
+        /// <param name="paymentBatchExecutionType">The execution type that will be used when converting this draft payment to a payment batch.</param>
+        public static BunqResponse<long> Create(List<DraftPaymentEntryObject> entries, long? numberOfRequiredAccepts, long? monetaryAccountId= null, string status = null, string previousUpdatedTimestamp = null, ScheduleApiObject schedule = null, string paymentBatchExecutionType = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -122,6 +129,7 @@ public static BunqResponse<int> Create(List<DraftPaymentEntryObject> entries, in
     {FIELD_PREVIOUS_UPDATED_TIMESTAMP, previousUpdatedTimestamp},
     {FIELD_NUMBER_OF_REQUIRED_ACCEPTS, numberOfRequiredAccepts},
     {FIELD_SCHEDULE, schedule},
+    {FIELD_PAYMENT_BATCH_EXECUTION_TYPE, paymentBatchExecutionType},
     };
     
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
@@ -136,7 +144,8 @@ public static BunqResponse<int> Create(List<DraftPaymentEntryObject> entries, in
         /// <param name="status">The status of the DraftPayment.</param>
         /// <param name="previousUpdatedTimestamp">The last updated_timestamp that you received for this DraftPayment. This needs to be provided to prevent race conditions.</param>
         /// <param name="schedule">The schedule details when creating or updating a scheduled payment.</param>
-        public static BunqResponse<int> Update(int draftPaymentId, int? monetaryAccountId= null, string status = null, string previousUpdatedTimestamp = null, ScheduleApiObject schedule = null, IDictionary<string, string> customHeaders = null)
+        /// <param name="paymentBatchExecutionType">The execution type that will be used when converting this draft payment to a payment batch.</param>
+        public static BunqResponse<long> Update(long draftPaymentId, long? monetaryAccountId= null, string status = null, string previousUpdatedTimestamp = null, ScheduleApiObject schedule = null, string paymentBatchExecutionType = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -147,6 +156,7 @@ public static BunqResponse<int> Update(int draftPaymentId, int? monetaryAccountI
     {FIELD_STATUS, status},
     {FIELD_PREVIOUS_UPDATED_TIMESTAMP, previousUpdatedTimestamp},
     {FIELD_SCHEDULE, schedule},
+    {FIELD_PAYMENT_BATCH_EXECUTION_TYPE, paymentBatchExecutionType},
     };
     
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
@@ -158,7 +168,7 @@ public static BunqResponse<int> Update(int draftPaymentId, int? monetaryAccountI
         /// <summary>
         /// Get a listing of all DraftPayments from a given MonetaryAccount.
         /// </summary>
-        public static BunqResponse<List<DraftPaymentApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<DraftPaymentApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -172,7 +182,7 @@ public static BunqResponse<List<DraftPaymentApiObject>> List(int? monetaryAccoun
         /// <summary>
         /// Get a specific DraftPayment.
         /// </summary>
-        public static BunqResponse<DraftPaymentApiObject> Get(int draftPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<DraftPaymentApiObject> Get(long draftPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -237,6 +247,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.PaymentBatchExecutionType != null)
+            {
+                return false;
+            }
+    
             return true;
         }
     
diff --git a/BunqSdk/Model/Generated/Endpoint/EventApiObject.cs b/BunqSdk/Model/Generated/Endpoint/EventApiObject.cs
index 1fa8639..a54c19d 100644
--- a/BunqSdk/Model/Generated/Endpoint/EventApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/EventApiObject.cs
@@ -32,7 +32,7 @@ public class EventApiObject : BunqModel
         /// The id of the event.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the event's creation.
         /// </summary>
@@ -88,7 +88,7 @@ public class EventApiObject : BunqModel
         /// <summary>
         /// Get a specific event for a given user.
         /// </summary>
-        public static BunqResponse<EventApiObject> Get(int eventId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<EventApiObject> Get(long eventId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewApiObject.cs
index 540cb83..c099e00 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewApiObject.cs
@@ -38,12 +38,12 @@ public class ExportAnnualOverviewApiObject : BunqModel
         /// The year for which the overview is.
         /// </summary>
         [JsonProperty(PropertyName = "year")]
-        public int? Year { get; set; }
+        public long? Year { get; set; }
         /// <summary>
         /// The id of the annual overview as created on the server.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the annual overview 's creation.
         /// </summary>
@@ -69,7 +69,7 @@ public class ExportAnnualOverviewApiObject : BunqModel
         /// Create a new annual overview for a specific year. An overview can be generated only for a past year.
         /// </summary>
         /// <param name="year">The year for which the overview is.</param>
-        public static BunqResponse<int> Create(int? year, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long? year, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -89,7 +89,7 @@ public static BunqResponse<int> Create(int? year, IDictionary<string, string> cu
         /// <summary>
         /// Get an annual overview for a user by its id.
         /// </summary>
-        public static BunqResponse<ExportAnnualOverviewApiObject> Get(int exportAnnualOverviewId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportAnnualOverviewApiObject> Get(long exportAnnualOverviewId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -101,7 +101,7 @@ public static BunqResponse<ExportAnnualOverviewApiObject> Get(int exportAnnualOv
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int exportAnnualOverviewId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long exportAnnualOverviewId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewContentApiObject.cs
index f168e4d..6f1d08a 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewContentApiObject.cs
@@ -28,7 +28,7 @@ public class ExportAnnualOverviewContentApiObject : BunqModel
         /// <summary>
         /// Used to retrieve the raw content of an annual overview.
         /// </summary>
-        public static BunqResponse<byte[]> List(int exportAnnualOverviewId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long exportAnnualOverviewId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportRibApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportRibApiObject.cs
index 1207747..15111ab 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportRibApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportRibApiObject.cs
@@ -31,7 +31,7 @@ public class ExportRibApiObject : BunqModel
         /// The id of the rib as created on the server.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the RIB's creation.
         /// </summary>
@@ -46,7 +46,7 @@ public class ExportRibApiObject : BunqModel
         /// <summary>
         /// Create a new RIB.
         /// </summary>
-        public static BunqResponse<int> Create(int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -65,7 +65,7 @@ public static BunqResponse<int> Create(int? monetaryAccountId= null, IDictionary
         /// <summary>
         /// Get a RIB for a monetary account by its id.
         /// </summary>
-        public static BunqResponse<ExportRibApiObject> Get(int exportRibId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportRibApiObject> Get(long exportRibId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -77,7 +77,7 @@ public static BunqResponse<ExportRibApiObject> Get(int exportRibId, int? monetar
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int exportRibId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long exportRibId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -90,7 +90,7 @@ public static BunqResponse<object> Delete(int exportRibId, int? monetaryAccountI
         /// <summary>
         /// List all the RIBs for a monetary account.
         /// </summary>
-        public static BunqResponse<List<ExportRibApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ExportRibApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportRibContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportRibContentApiObject.cs
index e79a862..edd0063 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportRibContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportRibContentApiObject.cs
@@ -27,7 +27,7 @@ public class ExportRibContentApiObject : BunqModel
         /// <summary>
         /// Used to retrieve the raw content of an RIB.
         /// </summary>
-        public static BunqResponse<byte[]> List(int exportRibId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long exportRibId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementApiObject.cs
index 956f392..161d215 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementApiObject.cs
@@ -67,7 +67,7 @@ public class ExportStatementApiObject : BunqModel
         /// The id of the customer statement model.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the statement model's creation.
         /// </summary>
@@ -87,7 +87,7 @@ public class ExportStatementApiObject : BunqModel
         /// MT940 Statement number. Unique per monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "statement_number")]
-        public int? StatementNumber { get; set; }
+        public long? StatementNumber { get; set; }
         /// <summary>
         /// The monetary account for which this statement was created.
         /// </summary>
@@ -101,7 +101,7 @@ public class ExportStatementApiObject : BunqModel
         /// <param name="dateEnd">The end date for making statements.</param>
         /// <param name="regionalFormat">Required for CSV exports. The regional format of the statement, can be UK_US (comma-separated) or EUROPEAN (semicolon-separated).</param>
         /// <param name="includeAttachment">Only for PDF exports. Includes attachments to mutations in the export, such as scanned receipts.</param>
-        public static BunqResponse<int> Create(string statementFormat, string dateStart, string dateEnd, int? monetaryAccountId= null, string regionalFormat = null, bool? includeAttachment = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string statementFormat, string dateStart, string dateEnd, long? monetaryAccountId= null, string regionalFormat = null, bool? includeAttachment = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -124,7 +124,7 @@ public static BunqResponse<int> Create(string statementFormat, string dateStart,
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<ExportStatementApiObject> Get(int exportStatementId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportStatementApiObject> Get(long exportStatementId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -136,7 +136,7 @@ public static BunqResponse<ExportStatementApiObject> Get(int exportStatementId,
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<ExportStatementApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ExportStatementApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -149,7 +149,7 @@ public static BunqResponse<List<ExportStatementApiObject>> List(int? monetaryAcc
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int exportStatementId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long exportStatementId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementCardApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementCardApiObject.cs
index 940faab..e7bb367 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementCardApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementCardApiObject.cs
@@ -30,7 +30,7 @@ public class ExportStatementCardApiObject : BunqModel
         /// The id of the customer statement model.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the statement model's creation.
         /// </summary>
@@ -65,11 +65,11 @@ public class ExportStatementCardApiObject : BunqModel
         /// The card for which this statement was created.
         /// </summary>
         [JsonProperty(PropertyName = "card_id")]
-        public int? CardId { get; set; }
+        public long? CardId { get; set; }
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<ExportStatementCardApiObject> Get(int cardId, int exportStatementCardId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportStatementCardApiObject> Get(long cardId, long exportStatementCardId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -81,7 +81,7 @@ public static BunqResponse<ExportStatementCardApiObject> Get(int cardId, int exp
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<ExportStatementCardApiObject>> List(int cardId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ExportStatementCardApiObject>> List(long cardId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementCardContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementCardContentApiObject.cs
index c94f934..3530c76 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementCardContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementCardContentApiObject.cs
@@ -28,7 +28,7 @@ public class ExportStatementCardContentApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<byte[]> List(int cardId, int exportStatementCardId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long cardId, long exportStatementCardId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementCardCsvApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementCardCsvApiObject.cs
index 6a2b09a..fb03cbb 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementCardCsvApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementCardCsvApiObject.cs
@@ -53,7 +53,7 @@ public class ExportStatementCardCsvApiObject : BunqModel
         /// The id of the customer statement model.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the statement model's creation.
         /// </summary>
@@ -73,14 +73,14 @@ public class ExportStatementCardCsvApiObject : BunqModel
         /// The card for which this statement was created.
         /// </summary>
         [JsonProperty(PropertyName = "card_id")]
-        public int? CardId { get; set; }
+        public long? CardId { get; set; }
     
         /// <summary>
         /// </summary>
         /// <param name="dateStart">The start date for making statements.</param>
         /// <param name="dateEnd">The end date for making statements.</param>
         /// <param name="regionalFormat">Required for CSV exports. The regional format of the statement, can be UK_US (comma-separated) or EUROPEAN (semicolon-separated).</param>
-        public static BunqResponse<int> Create(int cardId, string dateStart, string dateEnd, string regionalFormat, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long cardId, string dateStart, string dateEnd, string regionalFormat, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -101,7 +101,7 @@ public static BunqResponse<int> Create(int cardId, string dateStart, string date
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<ExportStatementCardCsvApiObject> Get(int cardId, int exportStatementCardCsvId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportStatementCardCsvApiObject> Get(long cardId, long exportStatementCardCsvId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -113,7 +113,7 @@ public static BunqResponse<ExportStatementCardCsvApiObject> Get(int cardId, int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<ExportStatementCardCsvApiObject>> List(int cardId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ExportStatementCardCsvApiObject>> List(long cardId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -126,7 +126,7 @@ public static BunqResponse<List<ExportStatementCardCsvApiObject>> List(int cardI
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int cardId, int exportStatementCardCsvId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long cardId, long exportStatementCardCsvId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementCardPdfApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementCardPdfApiObject.cs
index 5e5e242..37921d1 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementCardPdfApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementCardPdfApiObject.cs
@@ -47,7 +47,7 @@ public class ExportStatementCardPdfApiObject : BunqModel
         /// The id of the customer statement model.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the statement model's creation.
         /// </summary>
@@ -67,13 +67,13 @@ public class ExportStatementCardPdfApiObject : BunqModel
         /// The card for which this statement was created.
         /// </summary>
         [JsonProperty(PropertyName = "card_id")]
-        public int? CardId { get; set; }
+        public long? CardId { get; set; }
     
         /// <summary>
         /// </summary>
         /// <param name="dateStart">The start date for making statements.</param>
         /// <param name="dateEnd">The end date for making statements.</param>
-        public static BunqResponse<int> Create(int cardId, string dateStart, string dateEnd, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long cardId, string dateStart, string dateEnd, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -93,7 +93,7 @@ public static BunqResponse<int> Create(int cardId, string dateStart, string date
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<ExportStatementCardPdfApiObject> Get(int cardId, int exportStatementCardPdfId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportStatementCardPdfApiObject> Get(long cardId, long exportStatementCardPdfId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -105,7 +105,7 @@ public static BunqResponse<ExportStatementCardPdfApiObject> Get(int cardId, int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<ExportStatementCardPdfApiObject>> List(int cardId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ExportStatementCardPdfApiObject>> List(long cardId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -118,7 +118,7 @@ public static BunqResponse<List<ExportStatementCardPdfApiObject>> List(int cardI
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int cardId, int exportStatementCardPdfId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long cardId, long exportStatementCardPdfId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementContentApiObject.cs
index eb47405..cfca676 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementContentApiObject.cs
@@ -28,7 +28,7 @@ public class ExportStatementContentApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<byte[]> List(int customerStatementId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long customerStatementId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentApiObject.cs
index d89cb34..459d8f5 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentApiObject.cs
@@ -29,7 +29,7 @@ public class ExportStatementPaymentApiObject : BunqModel
         /// The id of the single payment statement model.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the statement model's creation.
         /// </summary>
@@ -48,7 +48,7 @@ public class ExportStatementPaymentApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<int> Create(int eventId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long eventId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -66,7 +66,7 @@ public static BunqResponse<int> Create(int eventId, int? monetaryAccountId= null
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<ExportStatementPaymentApiObject> Get(int eventId, int exportStatementPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportStatementPaymentApiObject> Get(long eventId, long exportStatementPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentContentApiObject.cs
index 9b7a282..185963f 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentContentApiObject.cs
@@ -26,7 +26,7 @@ public class ExportStatementPaymentContentApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<byte[]> List(int eventId, int statementId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long eventId, long statementId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/FeatureAnnouncementApiObject.cs b/BunqSdk/Model/Generated/Endpoint/FeatureAnnouncementApiObject.cs
index 6d335ff..ae999e5 100644
--- a/BunqSdk/Model/Generated/Endpoint/FeatureAnnouncementApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/FeatureAnnouncementApiObject.cs
@@ -48,7 +48,7 @@ public class FeatureAnnouncementApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<FeatureAnnouncementApiObject> Get(int featureAnnouncementId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<FeatureAnnouncementApiObject> Get(long featureAnnouncementId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/FulfillmentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/FulfillmentApiObject.cs
index 3ac74cc..a77411b 100644
--- a/BunqSdk/Model/Generated/Endpoint/FulfillmentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/FulfillmentApiObject.cs
@@ -38,7 +38,7 @@ public class FulfillmentApiObject : BunqModel
         /// The user id this fulfillment is required for.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The allowed statusses for this fulfillment.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/GinmonTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/GinmonTransactionApiObject.cs
index ed8f197..01408a0 100644
--- a/BunqSdk/Model/Generated/Endpoint/GinmonTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/GinmonTransactionApiObject.cs
@@ -64,7 +64,7 @@ public class GinmonTransactionApiObject : BunqModel
         /// The id of the event of transaction.
         /// </summary>
         [JsonProperty(PropertyName = "event_id")]
-        public int? EventId { get; set; }
+        public long? EventId { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/IdealMerchantTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/IdealMerchantTransactionApiObject.cs
index 259834e..e58b796 100644
--- a/BunqSdk/Model/Generated/Endpoint/IdealMerchantTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/IdealMerchantTransactionApiObject.cs
@@ -47,7 +47,7 @@ public class IdealMerchantTransactionApiObject : BunqModel
         /// The id of the monetary account this ideal merchant transaction links to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The alias of the monetary account to add money to.
         /// </summary>
@@ -103,7 +103,7 @@ public class IdealMerchantTransactionApiObject : BunqModel
         /// </summary>
         /// <param name="amountRequested">The requested amount of money to add.</param>
         /// <param name="issuer">The BIC of the issuing bank to ask for money.</param>
-        public static BunqResponse<int> Create(AmountObject amountRequested, string issuer, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(AmountObject amountRequested, string issuer, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -123,7 +123,7 @@ public static BunqResponse<int> Create(AmountObject amountRequested, string issu
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<IdealMerchantTransactionApiObject> Get(int idealMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<IdealMerchantTransactionApiObject> Get(long idealMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -135,7 +135,7 @@ public static BunqResponse<IdealMerchantTransactionApiObject> Get(int idealMerch
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<IdealMerchantTransactionApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<IdealMerchantTransactionApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/InsightApiObject.cs b/BunqSdk/Model/Generated/Endpoint/InsightApiObject.cs
index 0890c5b..cb27569 100644
--- a/BunqSdk/Model/Generated/Endpoint/InsightApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InsightApiObject.cs
@@ -54,7 +54,7 @@ public class InsightApiObject : BunqModel
         /// The number of the transactions in the category.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_transactions")]
-        public int? NumberOfTransactions { get; set; }
+        public long? NumberOfTransactions { get; set; }
     
         /// <summary>
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/InsightEventApiObject.cs b/BunqSdk/Model/Generated/Endpoint/InsightEventApiObject.cs
index b146c3b..2870e29 100644
--- a/BunqSdk/Model/Generated/Endpoint/InsightEventApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InsightEventApiObject.cs
@@ -29,7 +29,7 @@ public class InsightEventApiObject : BunqModel
         /// The id of the event.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the event's creation.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/InsightPreferenceDateApiObject.cs b/BunqSdk/Model/Generated/Endpoint/InsightPreferenceDateApiObject.cs
index 951563d..b714040 100644
--- a/BunqSdk/Model/Generated/Endpoint/InsightPreferenceDateApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InsightPreferenceDateApiObject.cs
@@ -33,7 +33,7 @@ public class InsightPreferenceDateApiObject : BunqModel
         /// The day of month at which budgeting/insights should start.
         /// </summary>
         [JsonProperty(PropertyName = "day_of_month")]
-        public int? DayOfMonth { get; set; }
+        public long? DayOfMonth { get; set; }
     
         /// <summary>
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/InstallationServerPublicKeyApiObject.cs b/BunqSdk/Model/Generated/Endpoint/InstallationServerPublicKeyApiObject.cs
index e1c4ee3..21f67c9 100644
--- a/BunqSdk/Model/Generated/Endpoint/InstallationServerPublicKeyApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InstallationServerPublicKeyApiObject.cs
@@ -34,7 +34,7 @@ public class InstallationServerPublicKeyApiObject : BunqModel
         /// <summary>
         /// Show the ServerPublicKey for this Installation.
         /// </summary>
-        public static BunqResponse<List<InstallationServerPublicKeyApiObject>> List(int installationId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<InstallationServerPublicKeyApiObject>> List(long installationId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/InvoiceApiObject.cs b/BunqSdk/Model/Generated/Endpoint/InvoiceApiObject.cs
index 44c2bb6..63e2f55 100644
--- a/BunqSdk/Model/Generated/Endpoint/InvoiceApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InvoiceApiObject.cs
@@ -18,8 +18,8 @@ public class InvoiceApiObject : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/invoice";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/invoice/{2}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/invoice";
     
         /// <summary>
         /// Field constants.
@@ -52,7 +52,7 @@ public class InvoiceApiObject : BunqModel
         /// The id of the invoice object.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the invoice object's creation.
         /// </summary>
@@ -136,27 +136,27 @@ public class InvoiceApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<InvoiceApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<InvoiceApiObject> Get(long invoiceId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
-            if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), invoiceId), new Dictionary<string, string>(), customHeaders);
     
-            return FromJsonList<InvoiceApiObject>(responseRaw, OBJECT_TYPE_GET);
+            return FromJson<InvoiceApiObject>(responseRaw, OBJECT_TYPE_GET);
         }
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<InvoiceApiObject> Get(int invoiceId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<InvoiceApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
+            if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), invoiceId), new Dictionary<string, string>(), customHeaders);
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
     
-            return FromJson<InvoiceApiObject>(responseRaw, OBJECT_TYPE_GET);
+            return FromJsonList<InvoiceApiObject>(responseRaw, OBJECT_TYPE_GET);
         }
     
     
diff --git a/BunqSdk/Model/Generated/Endpoint/InvoiceByUserApiObject.cs b/BunqSdk/Model/Generated/Endpoint/InvoiceByUserApiObject.cs
index 2b26beb..3078d44 100644
--- a/BunqSdk/Model/Generated/Endpoint/InvoiceByUserApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InvoiceByUserApiObject.cs
@@ -30,7 +30,7 @@ public class InvoiceByUserApiObject : BunqModel
         /// The id of the invoice object.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the invoice object's creation.
         /// </summary>
@@ -122,7 +122,7 @@ public static BunqResponse<List<InvoiceByUserApiObject>> List( IDictionary<strin
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<InvoiceByUserApiObject> Get(int invoiceByUserId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<InvoiceByUserApiObject> Get(long invoiceByUserId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfApiObject.cs b/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfApiObject.cs
index 57bae2e..a0831b5 100644
--- a/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfApiObject.cs
@@ -31,7 +31,7 @@ public class InvoiceExportPdfApiObject : BunqModel
         /// The id of the invoice export model.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the invoice export's creation.
         /// </summary>
@@ -50,7 +50,7 @@ public class InvoiceExportPdfApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<InvoiceExportPdfApiObject> Get(int invoiceId, int invoiceExportPdfId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<InvoiceExportPdfApiObject> Get(long invoiceId, long invoiceExportPdfId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -62,7 +62,7 @@ public static BunqResponse<InvoiceExportPdfApiObject> Get(int invoiceId, int inv
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<int> Create(int invoiceId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long invoiceId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -80,7 +80,7 @@ public static BunqResponse<int> Create(int invoiceId, IDictionary<string, string
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<int> Update(int invoiceId, int invoiceExportPdfId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long invoiceId, long invoiceExportPdfId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -98,7 +98,7 @@ public static BunqResponse<int> Update(int invoiceId, int invoiceExportPdfId, ID
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int invoiceId, int invoiceExportPdfId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long invoiceId, long invoiceExportPdfId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfContentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfContentApiObject.cs
index 4199ba6..c1e0296 100644
--- a/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfContentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfContentApiObject.cs
@@ -26,7 +26,7 @@ public class InvoiceExportPdfContentApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<byte[]> List(int invoiceId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(long invoiceId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/MasterCardActionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MasterCardActionApiObject.cs
index a20a13f..65e3793 100644
--- a/BunqSdk/Model/Generated/Endpoint/MasterCardActionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MasterCardActionApiObject.cs
@@ -30,17 +30,17 @@ public class MasterCardActionApiObject : BunqModel
         /// The id of the MastercardAction.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The id of the monetary account this action links to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The id of the card this action links to.
         /// </summary>
         [JsonProperty(PropertyName = "card_id")]
-        public int? CardId { get; set; }
+        public long? CardId { get; set; }
         /// <summary>
         /// The amount of the transaction in local currency.
         /// </summary>
@@ -188,7 +188,7 @@ public class MasterCardActionApiObject : BunqModel
         /// The secure code id for this mastercard action or null.
         /// </summary>
         [JsonProperty(PropertyName = "secure_code_id")]
-        public int? SecureCodeId { get; set; }
+        public long? SecureCodeId { get; set; }
         /// <summary>
         /// The ID of the wallet provider as defined by MasterCard. 420 = bunq Android app with Tap&Pay; 103 = Apple
         /// Pay.
@@ -224,7 +224,7 @@ public class MasterCardActionApiObject : BunqModel
         /// The whitelist id for this action or null.
         /// </summary>
         [JsonProperty(PropertyName = "eligible_whitelist_id")]
-        public int? EligibleWhitelistId { get; set; }
+        public long? EligibleWhitelistId { get; set; }
         /// <summary>
         /// The cashback payout item for this action or null
         /// </summary>
@@ -273,7 +273,7 @@ public class MasterCardActionApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<MasterCardActionApiObject> Get(int masterCardActionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MasterCardActionApiObject> Get(long masterCardActionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -285,7 +285,7 @@ public static BunqResponse<MasterCardActionApiObject> Get(int masterCardActionId
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<MasterCardActionApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<MasterCardActionApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/MasterCardActionRefundApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MasterCardActionRefundApiObject.cs
index 05f7225..b3aec00 100644
--- a/BunqSdk/Model/Generated/Endpoint/MasterCardActionRefundApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MasterCardActionRefundApiObject.cs
@@ -68,7 +68,7 @@ public class MasterCardActionRefundApiObject : BunqModel
         /// The id of the refund.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the refund's creation.
         /// </summary>
@@ -99,7 +99,7 @@ public class MasterCardActionRefundApiObject : BunqModel
         /// The id of mastercard action being refunded.
         /// </summary>
         [JsonProperty(PropertyName = "mastercard_action_id")]
-        public int? MastercardActionId { get; set; }
+        public long? MastercardActionId { get; set; }
         /// <summary>
         /// The monetary account label of the account that this action is created for.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/MasterCardActionReportApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MasterCardActionReportApiObject.cs
index 62215a5..6134bbb 100644
--- a/BunqSdk/Model/Generated/Endpoint/MasterCardActionReportApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MasterCardActionReportApiObject.cs
@@ -22,7 +22,7 @@ public class MasterCardActionReportApiObject : BunqModel
         /// The id of mastercard action being reported.
         /// </summary>
         [JsonProperty(PropertyName = "mastercard_action_id")]
-        public int? MastercardActionId { get; set; }
+        public long? MastercardActionId { get; set; }
         /// <summary>
         /// The id of mastercard action being reported.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/MasterCardIdentityCheckChallengeRequestUserApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MasterCardIdentityCheckChallengeRequestUserApiObject.cs
index cdaaf7f..dd5f756 100644
--- a/BunqSdk/Model/Generated/Endpoint/MasterCardIdentityCheckChallengeRequestUserApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MasterCardIdentityCheckChallengeRequestUserApiObject.cs
@@ -75,16 +75,16 @@ public class MasterCardIdentityCheckChallengeRequestUserApiObject : BunqModel
         /// The ID of the latest event for the identity check.
         /// </summary>
         [JsonProperty(PropertyName = "event_id")]
-        public int? EventId { get; set; }
+        public long? EventId { get; set; }
         /// <summary>
         /// The ID of the card used for the authentication request of the identity check.
         /// </summary>
         [JsonProperty(PropertyName = "card_id")]
-        public int? CardId { get; set; }
+        public long? CardId { get; set; }
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<MasterCardIdentityCheckChallengeRequestUserApiObject> Get(int masterCardIdentityCheckChallengeRequestUserId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MasterCardIdentityCheckChallengeRequestUserApiObject> Get(long masterCardIdentityCheckChallengeRequestUserId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -97,7 +97,7 @@ public static BunqResponse<MasterCardIdentityCheckChallengeRequestUserApiObject>
         /// <summary>
         /// </summary>
         /// <param name="status">The status of the identity check. Can be ACCEPTED_PENDING_RESPONSE or REJECTED_PENDING_RESPONSE.</param>
-        public static BunqResponse<int> Update(int masterCardIdentityCheckChallengeRequestUserId, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long masterCardIdentityCheckChallengeRequestUserId, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/MasterCardPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MasterCardPaymentApiObject.cs
index 7e02309..1b1c6fd 100644
--- a/BunqSdk/Model/Generated/Endpoint/MasterCardPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MasterCardPaymentApiObject.cs
@@ -29,7 +29,7 @@ public class MasterCardPaymentApiObject : BunqModel
         /// The id of the Payment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the Payment was done.
         /// </summary>
@@ -45,7 +45,7 @@ public class MasterCardPaymentApiObject : BunqModel
         /// outgoing Payment).
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The Amount transferred by the Payment. Will be negative for outgoing Payments and positive for incoming
         /// Payments (relative to the MonetaryAccount indicated by monetary_account_id).
@@ -122,12 +122,12 @@ public class MasterCardPaymentApiObject : BunqModel
         /// The id of the PaymentBatch if this Payment was part of one.
         /// </summary>
         [JsonProperty(PropertyName = "batch_id")]
-        public int? BatchId { get; set; }
+        public long? BatchId { get; set; }
         /// <summary>
         /// The id of the JobScheduled if the Payment was scheduled.
         /// </summary>
         [JsonProperty(PropertyName = "scheduled_id")]
-        public int? ScheduledId { get; set; }
+        public long? ScheduledId { get; set; }
         /// <summary>
         /// A shipping Address provided with the Payment, currently unused.
         /// </summary>
@@ -171,7 +171,7 @@ public class MasterCardPaymentApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<MasterCardPaymentApiObject>> List(int mastercardActionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<MasterCardPaymentApiObject>> List(long mastercardActionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountApiObject.cs
index d39739e..2816824 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountApiObject.cs
@@ -40,10 +40,15 @@ public class MonetaryAccountApiObject : BunqModel
         [JsonProperty(PropertyName = "balance")]
         public AmountObject Balance { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The settings of the MonetaryAccount.
         /// </summary>
@@ -150,7 +155,7 @@ public class MonetaryAccountApiObject : BunqModel
         /// <summary>
         /// Get a specific MonetaryAccount.
         /// </summary>
-        public static BunqResponse<MonetaryAccountApiObject> Get(int monetaryAccountId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountApiObject> Get(long monetaryAccountId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -189,6 +194,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.MonetaryAccountProfile != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBankApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBankApiObject.cs
index 63e854a..950c57b 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBankApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBankApiObject.cs
@@ -110,7 +110,7 @@ public class MonetaryAccountBankApiObject : BunqModel
         /// The id of the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the MonetaryAccountBank's creation.
         /// </summary>
@@ -160,12 +160,12 @@ public class MonetaryAccountBankApiObject : BunqModel
         /// The id of the User who owns the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The ids of the AutoSave.
         /// </summary>
@@ -177,6 +177,11 @@ public class MonetaryAccountBankApiObject : BunqModel
         [JsonProperty(PropertyName = "fulfillments")]
         public List<FulfillmentApiObject> Fulfillments { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The budgets of the MonetaryAccount.
         /// </summary>
         [JsonProperty(PropertyName = "budget")]
@@ -221,7 +226,7 @@ public class MonetaryAccountBankApiObject : BunqModel
         /// <param name="displayName">The legal name of the user / company using this monetary account.</param>
         /// <param name="setting">The settings of the MonetaryAccountBank.</param>
         /// <param name="countryIban">The country of the monetary account IBAN.</param>
-        public static BunqResponse<int> Create(string currency, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, string countryIban = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string currency, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, string countryIban = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -251,7 +256,7 @@ public static BunqResponse<int> Create(string currency, string description = nul
         /// <summary>
         /// Get a specific MonetaryAccountBank.
         /// </summary>
-        public static BunqResponse<MonetaryAccountBankApiObject> Get(int monetaryAccountBankId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountBankApiObject> Get(long monetaryAccountBankId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -273,7 +278,7 @@ public static BunqResponse<MonetaryAccountBankApiObject> Get(int monetaryAccount
         /// <param name="reasonDescription">The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountBank. Can be any user provided message. Should only be specified if updating the status to CANCELLED.</param>
         /// <param name="displayName">The legal name of the user / company using this monetary account.</param>
         /// <param name="setting">The settings of the MonetaryAccountBank.</param>
-        public static BunqResponse<int> Update(int monetaryAccountBankId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long monetaryAccountBankId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -432,6 +437,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.Budget != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBudgetApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBudgetApiObject.cs
index c12eaea..4bc3a5c 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBudgetApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBudgetApiObject.cs
@@ -39,12 +39,12 @@ public class MonetaryAccountBudgetApiObject : BunqModel
         /// DEPRECATED. The monetary account's ID from/to which the missing/exceeding funds will be transferred.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_source_funding_id")]
-        public int? MonetaryAccountSourceFundingId { get; set; }
+        public long? MonetaryAccountSourceFundingId { get; set; }
         /// <summary>
         /// DEPRECATED. The day of the month for the automatic top-up.
         /// </summary>
         [JsonProperty(PropertyName = "payment_day_of_month")]
-        public int? PaymentDayOfMonth { get; set; }
+        public long? PaymentDayOfMonth { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountCardApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountCardApiObject.cs
index c205716..78f621b 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountCardApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountCardApiObject.cs
@@ -30,7 +30,7 @@ public class MonetaryAccountCardApiObject : BunqModel
         /// The id of the MonetaryAccountCard.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the MonetaryAccountCard's creation.
         /// </summary>
@@ -67,11 +67,6 @@ public class MonetaryAccountCardApiObject : BunqModel
         [JsonProperty(PropertyName = "balance")]
         public AmountObject Balance { get; set; }
         /// <summary>
-        /// The current real balance Amount of the MonetaryAccountCard.
-        /// </summary>
-        [JsonProperty(PropertyName = "balance_real")]
-        public AmountObject BalanceReal { get; set; }
-        /// <summary>
         /// The aliases for the MonetaryAccount.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
@@ -95,17 +90,22 @@ public class MonetaryAccountCardApiObject : BunqModel
         /// The id of the User who owns the MonetaryAccountCard.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The RelationUser when the MonetaryAccount is accessed by the User via a share/connect.
         /// </summary>
         [JsonProperty(PropertyName = "relation_user")]
         public RelationUserApiObject RelationUser { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The settings of the MonetaryAccount.
         /// </summary>
@@ -171,7 +171,7 @@ public class MonetaryAccountCardApiObject : BunqModel
         /// <summary>
         /// Get a specific MonetaryAccountCard.
         /// </summary>
-        public static BunqResponse<MonetaryAccountCardApiObject> Get(int monetaryAccountCardId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountCardApiObject> Get(long monetaryAccountCardId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -184,7 +184,7 @@ public static BunqResponse<MonetaryAccountCardApiObject> Get(int monetaryAccount
         /// <summary>
         /// Update a specific existing MonetaryAccountCard.
         /// </summary>
-        public static BunqResponse<int> Update(int monetaryAccountCardId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long monetaryAccountCardId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -259,11 +259,6 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
-            if (this.BalanceReal != null)
-            {
-                return false;
-            }
-    
             if (this.Alias != null)
             {
                 return false;
@@ -294,6 +289,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.MonetaryAccountProfile != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountExternalApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountExternalApiObject.cs
index 8e246d3..d1dd433 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountExternalApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountExternalApiObject.cs
@@ -106,7 +106,7 @@ public class MonetaryAccountExternalApiObject : BunqModel
         /// The id of the MonetaryAccountExternal.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the MonetaryAccountExternal's creation.
         /// </summary>
@@ -156,12 +156,12 @@ public class MonetaryAccountExternalApiObject : BunqModel
         /// The id of the User who owns the MonetaryAccountExternal.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The ids of the AutoSave.
         /// </summary>
@@ -178,6 +178,11 @@ public class MonetaryAccountExternalApiObject : BunqModel
         [JsonProperty(PropertyName = "open_banking_account")]
         public OpenBankingAccountApiObject OpenBankingAccount { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The budgets of the MonetaryAccount.
         /// </summary>
         [JsonProperty(PropertyName = "budget")]
@@ -216,7 +221,7 @@ public class MonetaryAccountExternalApiObject : BunqModel
         /// <param name="reasonDescription">The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountExternal. Can be any user provided message. Should only be specified if updating the status to CANCELLED.</param>
         /// <param name="displayName">The legal name of the user / company using this monetary account.</param>
         /// <param name="setting">The settings of the MonetaryAccountExternal.</param>
-        public static BunqResponse<int> Create(string currency, string service, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string currency, string service, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -245,7 +250,7 @@ public static BunqResponse<int> Create(string currency, string service, string d
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<MonetaryAccountExternalApiObject> Get(int monetaryAccountExternalId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountExternalApiObject> Get(long monetaryAccountExternalId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -266,7 +271,7 @@ public static BunqResponse<MonetaryAccountExternalApiObject> Get(int monetaryAcc
         /// <param name="reasonDescription">The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountExternal. Can be any user provided message. Should only be specified if updating the status to CANCELLED.</param>
         /// <param name="displayName">The legal name of the user / company using this monetary account.</param>
         /// <param name="setting">The settings of the MonetaryAccountExternal.</param>
-        public static BunqResponse<int> Update(int monetaryAccountExternalId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long monetaryAccountExternalId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -434,6 +439,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.Budget != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountExternalSavingsApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountExternalSavingsApiObject.cs
index 64a34b1..35634d5 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountExternalSavingsApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountExternalSavingsApiObject.cs
@@ -112,7 +112,7 @@ public class MonetaryAccountExternalSavingsApiObject : BunqModel
         /// The id of the MonetaryAccountExternalSavings.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the MonetaryAccountExternalSavings's creation.
         /// </summary>
@@ -157,12 +157,12 @@ public class MonetaryAccountExternalSavingsApiObject : BunqModel
         /// The id of the User who owns the MonetaryAccountExternalSavings.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The ids of the AutoSave.
         /// </summary>
@@ -184,6 +184,11 @@ public class MonetaryAccountExternalSavingsApiObject : BunqModel
         [JsonProperty(PropertyName = "number_of_payment_remaining")]
         public string NumberOfPaymentRemaining { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The budgets of the MonetaryAccount.
         /// </summary>
         [JsonProperty(PropertyName = "budget")]
@@ -228,7 +233,7 @@ public class MonetaryAccountExternalSavingsApiObject : BunqModel
         /// <param name="displayName">The legal name of the user / company using this monetary account.</param>
         /// <param name="setting">The settings of the MonetaryAccountExternalSavings.</param>
         /// <param name="savingsGoal">The Savings Goal set for this MonetaryAccountSavings.</param>
-        public static BunqResponse<int> Create(string currency, string service, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, AmountObject savingsGoal = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string currency, string service, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, AmountObject savingsGoal = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -258,7 +263,7 @@ public static BunqResponse<int> Create(string currency, string service, string d
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<MonetaryAccountExternalSavingsApiObject> Get(int monetaryAccountExternalSavingsId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountExternalSavingsApiObject> Get(long monetaryAccountExternalSavingsId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -280,7 +285,7 @@ public static BunqResponse<MonetaryAccountExternalSavingsApiObject> Get(int mone
         /// <param name="displayName">The legal name of the user / company using this monetary account.</param>
         /// <param name="setting">The settings of the MonetaryAccountExternalSavings.</param>
         /// <param name="savingsGoal">The Savings Goal set for this MonetaryAccountSavings.</param>
-        public static BunqResponse<int> Update(int monetaryAccountExternalSavingsId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, AmountObject savingsGoal = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long monetaryAccountExternalSavingsId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSettingObject setting = null, AmountObject savingsGoal = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -449,6 +454,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.Budget != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountInvestmentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountInvestmentApiObject.cs
index 628fbe6..7a99f75 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountInvestmentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountInvestmentApiObject.cs
@@ -97,7 +97,7 @@ public class MonetaryAccountInvestmentApiObject : BunqModel
         /// ID of the MA to be used for the initial deposit to the investment account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_deposit_initial_id")]
-        public int? MonetaryAccountDepositInitialId { get; set; }
+        public long? MonetaryAccountDepositInitialId { get; set; }
         /// <summary>
         /// The amount to be transferred to the investment account as the initial deposit.
         /// </summary>
@@ -107,7 +107,7 @@ public class MonetaryAccountInvestmentApiObject : BunqModel
         /// The id of the MonetaryAccountInvestment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the MonetaryAccountInvestment's creation.
         /// </summary>
@@ -152,12 +152,12 @@ public class MonetaryAccountInvestmentApiObject : BunqModel
         /// The id of the User who owns the MonetaryAccountInvestment.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The ids of the AutoSave.
         /// </summary>
@@ -169,6 +169,11 @@ public class MonetaryAccountInvestmentApiObject : BunqModel
         [JsonProperty(PropertyName = "fulfillments")]
         public List<FulfillmentApiObject> Fulfillments { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The budgets of the MonetaryAccount.
         /// </summary>
         [JsonProperty(PropertyName = "budget")]
@@ -314,6 +319,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.Budget != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountJointApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountJointApiObject.cs
index 7617499..dc98342 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountJointApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountJointApiObject.cs
@@ -112,7 +112,7 @@ public class MonetaryAccountJointApiObject : BunqModel
         /// The id of the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the MonetaryAccountJoint's creation.
         /// </summary>
@@ -152,12 +152,12 @@ public class MonetaryAccountJointApiObject : BunqModel
         /// The id of the User who owns the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The ids of the AutoSave.
         /// </summary>
@@ -174,6 +174,11 @@ public class MonetaryAccountJointApiObject : BunqModel
         [JsonProperty(PropertyName = "co_owner_invite")]
         public CoOwnerInviteResponseApiObject CoOwnerInvite { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The budgets of the MonetaryAccount.
         /// </summary>
         [JsonProperty(PropertyName = "budget")]
@@ -208,7 +213,7 @@ public class MonetaryAccountJointApiObject : BunqModel
         /// <param name="reason">The reason for voluntarily cancelling (closing) the MonetaryAccountJoint, can only be OTHER. Should only be specified if updating the status to CANCELLED.</param>
         /// <param name="reasonDescription">The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountJoint. Can be any user provided message. Should only be specified if updating the status to CANCELLED.</param>
         /// <param name="setting">The settings of the MonetaryAccountJoint.</param>
-        public static BunqResponse<int> Create(string currency, List<CoOwnerObject> allCoOwner, string description = null, AmountObject dailyLimit = null, AmountObject overdraftLimit = null, List<PointerObject> alias = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string currency, List<CoOwnerObject> allCoOwner, string description = null, AmountObject dailyLimit = null, AmountObject overdraftLimit = null, List<PointerObject> alias = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -238,7 +243,7 @@ public static BunqResponse<int> Create(string currency, List<CoOwnerObject> allC
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<MonetaryAccountJointApiObject> Get(int monetaryAccountJointId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountJointApiObject> Get(long monetaryAccountJointId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -258,7 +263,7 @@ public static BunqResponse<MonetaryAccountJointApiObject> Get(int monetaryAccoun
         /// <param name="reason">The reason for voluntarily cancelling (closing) the MonetaryAccountJoint, can only be OTHER. Should only be specified if updating the status to CANCELLED.</param>
         /// <param name="reasonDescription">The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountJoint. Can be any user provided message. Should only be specified if updating the status to CANCELLED.</param>
         /// <param name="setting">The settings of the MonetaryAccountJoint.</param>
-        public static BunqResponse<int> Update(int monetaryAccountJointId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long monetaryAccountJointId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSettingObject setting = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -420,6 +425,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.Budget != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountLightApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountLightApiObject.cs
index 1f9effd..cbbc2a5 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountLightApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountLightApiObject.cs
@@ -80,7 +80,7 @@ public class MonetaryAccountLightApiObject : BunqModel
         /// The id of the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the MonetaryAccountLight's creation.
         /// </summary>
@@ -115,7 +115,7 @@ public class MonetaryAccountLightApiObject : BunqModel
         /// The id of the User who owns the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The ShareInviteBankResponse when the MonetaryAccount is accessed by the User via a share/connect.
         /// </summary>
@@ -167,10 +167,15 @@ public class MonetaryAccountLightApiObject : BunqModel
         [JsonProperty(PropertyName = "fulfillments")]
         public List<FulfillmentApiObject> Fulfillments { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The budgets of the MonetaryAccount.
         /// </summary>
@@ -342,6 +347,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.MonetaryAccountProfile != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSavingsApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSavingsApiObject.cs
index ed60070..8a6532d 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSavingsApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSavingsApiObject.cs
@@ -106,7 +106,7 @@ public class MonetaryAccountSavingsApiObject : BunqModel
         /// The id of the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the MonetaryAccountSavings's creation.
         /// </summary>
@@ -151,12 +151,12 @@ public class MonetaryAccountSavingsApiObject : BunqModel
         /// The id of the User who owns the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
-        public int? UserId { get; set; }
+        public long? UserId { get; set; }
         /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The progress in percentages for the Savings Goal set for this MonetaryAccountSavings.
         /// </summary>
@@ -183,6 +183,11 @@ public class MonetaryAccountSavingsApiObject : BunqModel
         [JsonProperty(PropertyName = "co_owner_invite")]
         public CoOwnerInviteResponseApiObject CoOwnerInvite { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The budgets of the MonetaryAccount.
         /// </summary>
         [JsonProperty(PropertyName = "budget")]
@@ -217,7 +222,7 @@ public class MonetaryAccountSavingsApiObject : BunqModel
         /// <param name="allCoOwner">The users the account will be joint with.</param>
         /// <param name="setting">The settings of the MonetaryAccountSavings.</param>
         /// <param name="savingsGoal">The Savings Goal set for this MonetaryAccountSavings.</param>
-        public static BunqResponse<int> Create(string currency, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, List<CoOwnerObject> allCoOwner = null, MonetaryAccountSettingObject setting = null, AmountObject savingsGoal = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string currency, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, List<CoOwnerObject> allCoOwner = null, MonetaryAccountSettingObject setting = null, AmountObject savingsGoal = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -247,7 +252,7 @@ public static BunqResponse<int> Create(string currency, string description = nul
         /// <summary>
         /// Get a specific MonetaryAccountSavings.
         /// </summary>
-        public static BunqResponse<MonetaryAccountSavingsApiObject> Get(int monetaryAccountSavingsId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountSavingsApiObject> Get(long monetaryAccountSavingsId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -269,7 +274,7 @@ public static BunqResponse<MonetaryAccountSavingsApiObject> Get(int monetaryAcco
         /// <param name="reasonDescription">The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountSavings. Can be any user provided message. Should only be specified if updating the status to CANCELLED.</param>
         /// <param name="setting">The settings of the MonetaryAccountSavings.</param>
         /// <param name="savingsGoal">The Savings Goal set for this MonetaryAccountSavings.</param>
-        public static BunqResponse<int> Update(int monetaryAccountSavingsId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSettingObject setting = null, AmountObject savingsGoal = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long monetaryAccountSavingsId, string description = null, AmountObject dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSettingObject setting = null, AmountObject savingsGoal = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -443,6 +448,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.Budget != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSwitchServiceApiObject.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSwitchServiceApiObject.cs
index b834fd4..9523162 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSwitchServiceApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSwitchServiceApiObject.cs
@@ -14,7 +14,7 @@ public class MonetaryAccountSwitchServiceApiObject : BunqModel
         /// The id of the monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the monetary account's creation.
         /// </summary>
@@ -46,10 +46,15 @@ public class MonetaryAccountSwitchServiceApiObject : BunqModel
         [JsonProperty(PropertyName = "balance")]
         public AmountObject Balance { get; set; }
         /// <summary>
+        /// The current available balance amount of the MonetaryAccount, converted to the user's default currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance_converted")]
+        public AmountObject BalanceConverted { get; set; }
+        /// <summary>
         /// The profiles of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
-        public MonetaryAccountProfileApiObject MonetaryAccountProfile { get; set; }
+        public List<MonetaryAccountProfileApiObject> MonetaryAccountProfile { get; set; }
         /// <summary>
         /// The settings of the MonetaryAccount.
         /// </summary>
@@ -157,6 +162,11 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.BalanceConverted != null)
+            {
+                return false;
+            }
+    
             if (this.MonetaryAccountProfile != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentAdyenCardTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentAdyenCardTransactionApiObject.cs
index c54501f..f157e27 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentAdyenCardTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentAdyenCardTransactionApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentAdyenCardTransactionApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentAdyenCardTransactionApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int adyenCardTransactionId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long adyenCardTransactionId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int adyenCardTransactionId, int? attachme
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int adyenCardTransactionId, int noteAttachmentAdyenCardTransactionId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long adyenCardTransactionId, long noteAttachmentAdyenCardTransactionId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int adyenCardTransactionId, int noteAttac
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int adyenCardTransactionId, int noteAttachmentAdyenCardTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long adyenCardTransactionId, long noteAttachmentAdyenCardTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -127,7 +127,7 @@ public static BunqResponse<object> Delete(int adyenCardTransactionId, int noteAt
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentAdyenCardTransactionApiObject>> List(int adyenCardTransactionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentAdyenCardTransactionApiObject>> List(long adyenCardTransactionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -140,7 +140,7 @@ public static BunqResponse<List<NoteAttachmentAdyenCardTransactionApiObject>> Li
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentAdyenCardTransactionApiObject> Get(int adyenCardTransactionId, int noteAttachmentAdyenCardTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentAdyenCardTransactionApiObject> Get(long adyenCardTransactionId, long noteAttachmentAdyenCardTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
index 087b7c7..06a1574 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int switchServicePaymentId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long switchServicePaymentId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int switchServicePaymentId, int? attachme
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int switchServicePaymentId, int noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long switchServicePaymentId, long noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int switchServicePaymentId, int noteAttac
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int switchServicePaymentId, int noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long switchServicePaymentId, long noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int switchServicePaymentId, int noteAt
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject>> List(int switchServicePaymentId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject>> List(long switchServicePaymentId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentBankSwitchServiceNetherlandsIncomi
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject> Get(int switchServicePaymentId, int noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentBankSwitchServiceNetherlandsIncomingPaymentApiObject> Get(long switchServicePaymentId, long noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBunqMeFundraiserResultApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBunqMeFundraiserResultApiObject.cs
index fd485ec..672b4dc 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBunqMeFundraiserResultApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBunqMeFundraiserResultApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentBunqMeFundraiserResultApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentBunqMeFundraiserResultApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int bunqmeFundraiserResultId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long bunqmeFundraiserResultId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int bunqmeFundraiserResultId, int? attach
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int bunqmeFundraiserResultId, int noteAttachmentBunqMeFundraiserResultId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long bunqmeFundraiserResultId, long noteAttachmentBunqMeFundraiserResultId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int bunqmeFundraiserResultId, int noteAtt
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int bunqmeFundraiserResultId, int noteAttachmentBunqMeFundraiserResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long bunqmeFundraiserResultId, long noteAttachmentBunqMeFundraiserResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int bunqmeFundraiserResultId, int note
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentBunqMeFundraiserResultApiObject>> List(int bunqmeFundraiserResultId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentBunqMeFundraiserResultApiObject>> List(long bunqmeFundraiserResultId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentBunqMeFundraiserResultApiObject>>
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentBunqMeFundraiserResultApiObject> Get(int bunqmeFundraiserResultId, int noteAttachmentBunqMeFundraiserResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentBunqMeFundraiserResultApiObject> Get(long bunqmeFundraiserResultId, long noteAttachmentBunqMeFundraiserResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentDraftPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentDraftPaymentApiObject.cs
index a457faf..f465cb1 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentDraftPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentDraftPaymentApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentDraftPaymentApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentDraftPaymentApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int draftPaymentId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long draftPaymentId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int draftPaymentId, int? attachmentId, in
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int draftPaymentId, int noteAttachmentDraftPaymentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long draftPaymentId, long noteAttachmentDraftPaymentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int draftPaymentId, int noteAttachmentDra
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int draftPaymentId, int noteAttachmentDraftPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long draftPaymentId, long noteAttachmentDraftPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int draftPaymentId, int noteAttachment
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentDraftPaymentApiObject>> List(int draftPaymentId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentDraftPaymentApiObject>> List(long draftPaymentId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentDraftPaymentApiObject>> List(int d
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentDraftPaymentApiObject> Get(int draftPaymentId, int noteAttachmentDraftPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentDraftPaymentApiObject> Get(long draftPaymentId, long noteAttachmentDraftPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentIdealMerchantTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentIdealMerchantTransactionApiObject.cs
index 751ba9a..ea93994 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentIdealMerchantTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentIdealMerchantTransactionApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentIdealMerchantTransactionApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentIdealMerchantTransactionApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int idealMerchantTransactionId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long idealMerchantTransactionId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int idealMerchantTransactionId, int? atta
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int idealMerchantTransactionId, int noteAttachmentIdealMerchantTransactionId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long idealMerchantTransactionId, long noteAttachmentIdealMerchantTransactionId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int idealMerchantTransactionId, int noteA
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int idealMerchantTransactionId, int noteAttachmentIdealMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long idealMerchantTransactionId, long noteAttachmentIdealMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int idealMerchantTransactionId, int no
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentIdealMerchantTransactionApiObject>> List(int idealMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentIdealMerchantTransactionApiObject>> List(long idealMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentIdealMerchantTransactionApiObject>
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentIdealMerchantTransactionApiObject> Get(int idealMerchantTransactionId, int noteAttachmentIdealMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentIdealMerchantTransactionApiObject> Get(long idealMerchantTransactionId, long noteAttachmentIdealMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentMasterCardActionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentMasterCardActionApiObject.cs
index b6efecf..64dca1d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentMasterCardActionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentMasterCardActionApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentMasterCardActionApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentMasterCardActionApiObject : BunqModel
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
-        public static BunqResponse<int> Create(int mastercardActionId, string description, int? attachmentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long mastercardActionId, string description, long? attachmentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int mastercardActionId, string descriptio
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int mastercardActionId, int noteAttachmentMasterCardActionId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long mastercardActionId, long noteAttachmentMasterCardActionId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int mastercardActionId, int noteAttachmen
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int mastercardActionId, int noteAttachmentMasterCardActionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long mastercardActionId, long noteAttachmentMasterCardActionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int mastercardActionId, int noteAttach
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentMasterCardActionApiObject>> List(int mastercardActionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentMasterCardActionApiObject>> List(long mastercardActionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentMasterCardActionApiObject>> List(i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentMasterCardActionApiObject> Get(int mastercardActionId, int noteAttachmentMasterCardActionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentMasterCardActionApiObject> Get(long mastercardActionId, long noteAttachmentMasterCardActionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentOpenBankingMerchantTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentOpenBankingMerchantTransactionApiObject.cs
index f1306b8..82fd822 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentOpenBankingMerchantTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentOpenBankingMerchantTransactionApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentOpenBankingMerchantTransactionApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentOpenBankingMerchantTransactionApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int openBankingMerchantTransactionId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long openBankingMerchantTransactionId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int openBankingMerchantTransactionId, int
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int openBankingMerchantTransactionId, int noteAttachmentOpenBankingMerchantTransactionId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long openBankingMerchantTransactionId, long noteAttachmentOpenBankingMerchantTransactionId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int openBankingMerchantTransactionId, int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int openBankingMerchantTransactionId, int noteAttachmentOpenBankingMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long openBankingMerchantTransactionId, long noteAttachmentOpenBankingMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -127,7 +127,7 @@ public static BunqResponse<object> Delete(int openBankingMerchantTransactionId,
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentOpenBankingMerchantTransactionApiObject>> List(int openBankingMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentOpenBankingMerchantTransactionApiObject>> List(long openBankingMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -140,7 +140,7 @@ public static BunqResponse<List<NoteAttachmentOpenBankingMerchantTransactionApiO
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentOpenBankingMerchantTransactionApiObject> Get(int openBankingMerchantTransactionId, int noteAttachmentOpenBankingMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentOpenBankingMerchantTransactionApiObject> Get(long openBankingMerchantTransactionId, long noteAttachmentOpenBankingMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentApiObject.cs
index c7d0c20..518b3de 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentPaymentApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentPaymentApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int paymentId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long paymentId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int paymentId, int? attachmentId, int? mo
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int paymentId, int noteAttachmentPaymentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentId, long noteAttachmentPaymentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int paymentId, int noteAttachmentPaymentI
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentId, int noteAttachmentPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long paymentId, long noteAttachmentPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int paymentId, int noteAttachmentPayme
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentPaymentApiObject>> List(int paymentId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentPaymentApiObject>> List(long paymentId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentPaymentApiObject>> List(int paymen
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentPaymentApiObject> Get(int paymentId, int noteAttachmentPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentPaymentApiObject> Get(long paymentId, long noteAttachmentPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentBatchApiObject.cs
index e873c2f..d88a139 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentBatchApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentPaymentBatchApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentPaymentBatchApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int paymentBatchId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long paymentBatchId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int paymentBatchId, int? attachmentId, in
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int paymentBatchId, int noteAttachmentPaymentBatchId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentBatchId, long noteAttachmentPaymentBatchId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int paymentBatchId, int noteAttachmentPay
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentBatchId, int noteAttachmentPaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long paymentBatchId, long noteAttachmentPaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int paymentBatchId, int noteAttachment
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentPaymentBatchApiObject>> List(int paymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentPaymentBatchApiObject>> List(long paymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentPaymentBatchApiObject>> List(int p
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentPaymentBatchApiObject> Get(int paymentBatchId, int noteAttachmentPaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentPaymentBatchApiObject> Get(long paymentBatchId, long noteAttachmentPaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentDelayedApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentDelayedApiObject.cs
index 5e70064..e8369cf 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentDelayedApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentDelayedApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentPaymentDelayedApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentPaymentDelayedApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int paymentDelayedId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long paymentDelayedId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int paymentDelayedId, int? attachmentId,
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int paymentDelayedId, int noteAttachmentPaymentDelayedId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentDelayedId, long noteAttachmentPaymentDelayedId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int paymentDelayedId, int noteAttachmentP
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentDelayedId, int noteAttachmentPaymentDelayedId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long paymentDelayedId, long noteAttachmentPaymentDelayedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -127,7 +127,7 @@ public static BunqResponse<object> Delete(int paymentDelayedId, int noteAttachme
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentPaymentDelayedApiObject>> List(int paymentDelayedId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentPaymentDelayedApiObject>> List(long paymentDelayedId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -140,7 +140,7 @@ public static BunqResponse<List<NoteAttachmentPaymentDelayedApiObject>> List(int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentPaymentDelayedApiObject> Get(int paymentDelayedId, int noteAttachmentPaymentDelayedId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentPaymentDelayedApiObject> Get(long paymentDelayedId, long noteAttachmentPaymentDelayedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentSuspendedApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentSuspendedApiObject.cs
new file mode 100644
index 0000000..338f60e
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentSuspendedApiObject.cs
@@ -0,0 +1,198 @@
+using Bunq.Sdk.Context;
+using Bunq.Sdk.Http;
+using Bunq.Sdk.Json;
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Text;
+using System;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Used to manage attachment notes.
+    /// </summary>
+    public class NoteAttachmentPaymentSuspendedApiObject : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-attachment/{3}";
+    
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_DESCRIPTION = "description";
+        public const string FIELD_ATTACHMENT_ID = "attachment_id";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "NoteAttachment";
+    
+        /// <summary>
+        /// Optional description of the attachment.
+        /// </summary>
+        [JsonProperty(PropertyName = "description")]
+        public string Description { get; set; }
+        /// <summary>
+        /// The reference to the uploaded file to attach to this note.
+        /// </summary>
+        [JsonProperty(PropertyName = "attachment_id")]
+        public long? AttachmentId { get; set; }
+        /// <summary>
+        /// The id of the note.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public long? Id { get; set; }
+        /// <summary>
+        /// The timestamp of the note's creation.
+        /// </summary>
+        [JsonProperty(PropertyName = "created")]
+        public string Created { get; set; }
+        /// <summary>
+        /// The timestamp of the note's last update.
+        /// </summary>
+        [JsonProperty(PropertyName = "updated")]
+        public string Updated { get; set; }
+        /// <summary>
+        /// The label of the user who created this note.
+        /// </summary>
+        [JsonProperty(PropertyName = "label_user_creator")]
+        public MonetaryAccountReference LabelUserCreator { get; set; }
+        /// <summary>
+        /// The attachment attached to the note.
+        /// </summary>
+        [JsonProperty(PropertyName = "attachment")]
+        public List<AttachmentMonetaryAccountPaymentObject> Attachment { get; set; }
+    
+        /// <summary>
+        /// </summary>
+        /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
+        /// <param name="description">Optional description of the attachment.</param>
+        public static BunqResponse<long> Create(long paymentSuspendedId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+    
+            var requestMap = new Dictionary<string, object>
+    {
+    {FIELD_DESCRIPTION, description},
+    {FIELD_ATTACHMENT_ID, attachmentId},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        /// <param name="description">Optional description of the attachment.</param>
+        public static BunqResponse<long> Update(long paymentSuspendedId, long noteAttachmentPaymentSuspendedId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+    
+            var requestMap = new Dictionary<string, object>
+    {
+    {FIELD_DESCRIPTION, description},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId, noteAttachmentPaymentSuspendedId), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<object> Delete(long paymentSuspendedId, long noteAttachmentPaymentSuspendedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId, noteAttachmentPaymentSuspendedId), customHeaders);
+    
+            return new BunqResponse<object>(null, responseRaw.Headers);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<List<NoteAttachmentPaymentSuspendedApiObject>> List(long paymentSuspendedId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (urlParams == null) urlParams = new Dictionary<string, string>();
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId), urlParams, customHeaders);
+    
+            return FromJsonList<NoteAttachmentPaymentSuspendedApiObject>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<NoteAttachmentPaymentSuspendedApiObject> Get(long paymentSuspendedId, long noteAttachmentPaymentSuspendedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId, noteAttachmentPaymentSuspendedId), new Dictionary<string, string>(), customHeaders);
+    
+            return FromJson<NoteAttachmentPaymentSuspendedApiObject>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Id != null)
+            {
+                return false;
+            }
+    
+            if (this.Created != null)
+            {
+                return false;
+            }
+    
+            if (this.Updated != null)
+            {
+                return false;
+            }
+    
+            if (this.LabelUserCreator != null)
+            {
+                return false;
+            }
+    
+            if (this.Description != null)
+            {
+                return false;
+            }
+    
+            if (this.Attachment != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static NoteAttachmentPaymentSuspendedApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<NoteAttachmentPaymentSuspendedApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryApiObject.cs
index d7b0028..390255a 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentRequestInquiryApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentRequestInquiryApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int requestInquiryId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long requestInquiryId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int requestInquiryId, int? attachmentId,
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int requestInquiryId, int noteAttachmentRequestInquiryId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long requestInquiryId, long noteAttachmentRequestInquiryId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int requestInquiryId, int noteAttachmentR
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestInquiryId, int noteAttachmentRequestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long requestInquiryId, long noteAttachmentRequestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int requestInquiryId, int noteAttachme
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentRequestInquiryApiObject>> List(int requestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentRequestInquiryApiObject>> List(long requestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentRequestInquiryApiObject>> List(int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentRequestInquiryApiObject> Get(int requestInquiryId, int noteAttachmentRequestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentRequestInquiryApiObject> Get(long requestInquiryId, long noteAttachmentRequestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryBatchApiObject.cs
index 5babdfe..6a9bb08 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryBatchApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentRequestInquiryBatchApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentRequestInquiryBatchApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int requestInquiryBatchId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long requestInquiryBatchId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int requestInquiryBatchId, int? attachmen
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int requestInquiryBatchId, int noteAttachmentRequestInquiryBatchId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long requestInquiryBatchId, long noteAttachmentRequestInquiryBatchId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int requestInquiryBatchId, int noteAttach
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestInquiryBatchId, int noteAttachmentRequestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long requestInquiryBatchId, long noteAttachmentRequestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int requestInquiryBatchId, int noteAtt
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentRequestInquiryBatchApiObject>> List(int requestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentRequestInquiryBatchApiObject>> List(long requestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentRequestInquiryBatchApiObject>> Lis
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentRequestInquiryBatchApiObject> Get(int requestInquiryBatchId, int noteAttachmentRequestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentRequestInquiryBatchApiObject> Get(long requestInquiryBatchId, long noteAttachmentRequestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestResponseApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestResponseApiObject.cs
index d033a6b..a9b7323 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestResponseApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestResponseApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentRequestResponseApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentRequestResponseApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int requestResponseId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long requestResponseId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int requestResponseId, int? attachmentId,
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int requestResponseId, int noteAttachmentRequestResponseId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long requestResponseId, long noteAttachmentRequestResponseId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int requestResponseId, int noteAttachment
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestResponseId, int noteAttachmentRequestResponseId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long requestResponseId, long noteAttachmentRequestResponseId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int requestResponseId, int noteAttachm
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentRequestResponseApiObject>> List(int requestResponseId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentRequestResponseApiObject>> List(long requestResponseId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentRequestResponseApiObject>> List(in
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentRequestResponseApiObject> Get(int requestResponseId, int noteAttachmentRequestResponseId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentRequestResponseApiObject> Get(long requestResponseId, long noteAttachmentRequestResponseId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleInstanceApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleInstanceApiObject.cs
index 9e8178d..b2c2509 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleInstanceApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleInstanceApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentScheduleInstanceApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentScheduleInstanceApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int scheduleId, int scheduleInstanceId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long scheduleId, long scheduleInstanceId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int scheduleId, int scheduleInstanceId, i
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int scheduleId, int scheduleInstanceId, int noteAttachmentScheduleInstanceId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long scheduleId, long scheduleInstanceId, long noteAttachmentScheduleInstanceId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int scheduleId, int scheduleInstanceId, i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int scheduleId, int scheduleInstanceId, int noteAttachmentScheduleInstanceId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long scheduleId, long scheduleInstanceId, long noteAttachmentScheduleInstanceId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int scheduleId, int scheduleInstanceId
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentScheduleInstanceApiObject>> List(int scheduleId, int scheduleInstanceId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentScheduleInstanceApiObject>> List(long scheduleId, long scheduleInstanceId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentScheduleInstanceApiObject>> List(i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentScheduleInstanceApiObject> Get(int scheduleId, int scheduleInstanceId, int noteAttachmentScheduleInstanceId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentScheduleInstanceApiObject> Get(long scheduleId, long scheduleInstanceId, long noteAttachmentScheduleInstanceId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentApiObject.cs
index 675d57d..956bd9d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentSchedulePaymentApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentSchedulePaymentApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int schedulePaymentId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long schedulePaymentId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int schedulePaymentId, int? attachmentId,
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int schedulePaymentId, int noteAttachmentSchedulePaymentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long schedulePaymentId, long noteAttachmentSchedulePaymentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int schedulePaymentId, int noteAttachment
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentId, int noteAttachmentSchedulePaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long schedulePaymentId, long noteAttachmentSchedulePaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int schedulePaymentId, int noteAttachm
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentSchedulePaymentApiObject>> List(int schedulePaymentId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentSchedulePaymentApiObject>> List(long schedulePaymentId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentSchedulePaymentApiObject>> List(in
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentSchedulePaymentApiObject> Get(int schedulePaymentId, int noteAttachmentSchedulePaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentSchedulePaymentApiObject> Get(long schedulePaymentId, long noteAttachmentSchedulePaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentBatchApiObject.cs
index ce1a802..ca257e9 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentBatchApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentSchedulePaymentBatchApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentSchedulePaymentBatchApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int schedulePaymentBatchId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long schedulePaymentBatchId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int schedulePaymentBatchId, int? attachme
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int schedulePaymentBatchId, int noteAttachmentSchedulePaymentBatchId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long schedulePaymentBatchId, long noteAttachmentSchedulePaymentBatchId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int schedulePaymentBatchId, int noteAttac
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int noteAttachmentSchedulePaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long schedulePaymentBatchId, long noteAttachmentSchedulePaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int schedulePaymentBatchId, int noteAt
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentSchedulePaymentBatchApiObject>> List(int schedulePaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentSchedulePaymentBatchApiObject>> List(long schedulePaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentSchedulePaymentBatchApiObject>> Li
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentSchedulePaymentBatchApiObject> Get(int schedulePaymentBatchId, int noteAttachmentSchedulePaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentSchedulePaymentBatchApiObject> Get(long schedulePaymentBatchId, long noteAttachmentSchedulePaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleRequestApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleRequestApiObject.cs
index 6aacb2b..16d8c53 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleRequestApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleRequestApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentScheduleRequestApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentScheduleRequestApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int scheduleRequestInquiryId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long scheduleRequestInquiryId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int scheduleRequestInquiryId, int? attach
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int scheduleRequestInquiryId, int noteAttachmentScheduleRequestId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long scheduleRequestInquiryId, long noteAttachmentScheduleRequestId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int scheduleRequestInquiryId, int noteAtt
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int scheduleRequestInquiryId, int noteAttachmentScheduleRequestId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long scheduleRequestInquiryId, long noteAttachmentScheduleRequestId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int scheduleRequestInquiryId, int note
         /// <summary>
         /// Manage the notes for a scheduled request.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentScheduleRequestApiObject>> List(int scheduleRequestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentScheduleRequestApiObject>> List(long scheduleRequestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentScheduleRequestApiObject>> List(in
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentScheduleRequestApiObject> Get(int scheduleRequestInquiryId, int noteAttachmentScheduleRequestId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentScheduleRequestApiObject> Get(long scheduleRequestInquiryId, long noteAttachmentScheduleRequestId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleRequestBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleRequestBatchApiObject.cs
index 673d207..dd50bf7 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleRequestBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleRequestBatchApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentScheduleRequestBatchApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentScheduleRequestBatchApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int scheduleRequestInquiryBatchId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long scheduleRequestInquiryBatchId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int scheduleRequestInquiryBatchId, int? a
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int scheduleRequestInquiryBatchId, int noteAttachmentScheduleRequestBatchId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long scheduleRequestInquiryBatchId, long noteAttachmentScheduleRequestBatchId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int scheduleRequestInquiryBatchId, int no
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int scheduleRequestInquiryBatchId, int noteAttachmentScheduleRequestBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long scheduleRequestInquiryBatchId, long noteAttachmentScheduleRequestBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int scheduleRequestInquiryBatchId, int
         /// <summary>
         /// Manage the notes for a scheduled request.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentScheduleRequestBatchApiObject>> List(int scheduleRequestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentScheduleRequestBatchApiObject>> List(long scheduleRequestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentScheduleRequestBatchApiObject>> Li
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentScheduleRequestBatchApiObject> Get(int scheduleRequestInquiryBatchId, int noteAttachmentScheduleRequestBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentScheduleRequestBatchApiObject> Get(long scheduleRequestInquiryBatchId, long noteAttachmentScheduleRequestBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSofortMerchantTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSofortMerchantTransactionApiObject.cs
index 69823e3..a7d6ea4 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSofortMerchantTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSofortMerchantTransactionApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentSofortMerchantTransactionApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentSofortMerchantTransactionApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int sofortMerchantTransactionId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long sofortMerchantTransactionId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int sofortMerchantTransactionId, int? att
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int sofortMerchantTransactionId, int noteAttachmentSofortMerchantTransactionId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long sofortMerchantTransactionId, long noteAttachmentSofortMerchantTransactionId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int sofortMerchantTransactionId, int note
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int sofortMerchantTransactionId, int noteAttachmentSofortMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long sofortMerchantTransactionId, long noteAttachmentSofortMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int sofortMerchantTransactionId, int n
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentSofortMerchantTransactionApiObject>> List(int sofortMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentSofortMerchantTransactionApiObject>> List(long sofortMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentSofortMerchantTransactionApiObject
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentSofortMerchantTransactionApiObject> Get(int sofortMerchantTransactionId, int noteAttachmentSofortMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentSofortMerchantTransactionApiObject> Get(long sofortMerchantTransactionId, long noteAttachmentSofortMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentWhitelistResultApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentWhitelistResultApiObject.cs
index 527380e..b2a32ff 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentWhitelistResultApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentWhitelistResultApiObject.cs
@@ -44,12 +44,12 @@ public class NoteAttachmentWhitelistResultApiObject : BunqModel
         /// The reference to the uploaded file to attach to this note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_id")]
-        public int? AttachmentId { get; set; }
+        public long? AttachmentId { get; set; }
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -75,7 +75,7 @@ public class NoteAttachmentWhitelistResultApiObject : BunqModel
         /// </summary>
         /// <param name="attachmentId">The reference to the uploaded file to attach to this note.</param>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Create(int whitelistId, int whitelistResultId, int? attachmentId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long whitelistId, long whitelistResultId, long? attachmentId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<int> Create(int whitelistId, int whitelistResultId, i
         /// <summary>
         /// </summary>
         /// <param name="description">Optional description of the attachment.</param>
-        public static BunqResponse<int> Update(int whitelistId, int whitelistResultId, int noteAttachmentWhitelistResultId, int? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long whitelistId, long whitelistResultId, long noteAttachmentWhitelistResultId, long? monetaryAccountId= null, string description = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Update(int whitelistId, int whitelistResultId, i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int whitelistId, int whitelistResultId, int noteAttachmentWhitelistResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long whitelistId, long whitelistResultId, long noteAttachmentWhitelistResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -128,7 +128,7 @@ public static BunqResponse<object> Delete(int whitelistId, int whitelistResultId
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentWhitelistResultApiObject>> List(int whitelistId, int whitelistResultId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentWhitelistResultApiObject>> List(long whitelistId, long whitelistResultId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -141,7 +141,7 @@ public static BunqResponse<List<NoteAttachmentWhitelistResultApiObject>> List(in
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentWhitelistResultApiObject> Get(int whitelistId, int whitelistResultId, int noteAttachmentWhitelistResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentWhitelistResultApiObject> Get(long whitelistId, long whitelistResultId, long noteAttachmentWhitelistResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextAdyenCardTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextAdyenCardTransactionApiObject.cs
index 1191684..d87b3c5 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextAdyenCardTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextAdyenCardTransactionApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextAdyenCardTransactionApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextAdyenCardTransactionApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int adyenCardTransactionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long adyenCardTransactionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int adyenCardTransactionId, int? monetary
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int adyenCardTransactionId, int noteTextAdyenCardTransactionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long adyenCardTransactionId, long noteTextAdyenCardTransactionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int adyenCardTransactionId, int noteTextA
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int adyenCardTransactionId, int noteTextAdyenCardTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long adyenCardTransactionId, long noteTextAdyenCardTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -114,7 +114,7 @@ public static BunqResponse<object> Delete(int adyenCardTransactionId, int noteTe
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NoteTextAdyenCardTransactionApiObject>> List(int adyenCardTransactionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextAdyenCardTransactionApiObject>> List(long adyenCardTransactionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -127,7 +127,7 @@ public static BunqResponse<List<NoteTextAdyenCardTransactionApiObject>> List(int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextAdyenCardTransactionApiObject> Get(int adyenCardTransactionId, int noteTextAdyenCardTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextAdyenCardTransactionApiObject> Get(long adyenCardTransactionId, long noteTextAdyenCardTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
index 2bc5830..4437089 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject : Bunq
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject : Bunq
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int switchServicePaymentId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long switchServicePaymentId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int switchServicePaymentId, int? monetary
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int switchServicePaymentId, int noteTextBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long switchServicePaymentId, long noteTextBankSwitchServiceNetherlandsIncomingPaymentId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int switchServicePaymentId, int noteTextB
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int switchServicePaymentId, int noteTextBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long switchServicePaymentId, long noteTextBankSwitchServiceNetherlandsIncomingPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int switchServicePaymentId, int noteTe
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject>> List(int switchServicePaymentId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject>> List(long switchServicePaymentId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextBankSwitchServiceNetherlandsIncomingPaym
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject> Get(int switchServicePaymentId, int noteTextBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextBankSwitchServiceNetherlandsIncomingPaymentApiObject> Get(long switchServicePaymentId, long noteTextBankSwitchServiceNetherlandsIncomingPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextBunqMeFundraiserResultApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextBunqMeFundraiserResultApiObject.cs
index 4f2f6d7..c71e1d4 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextBunqMeFundraiserResultApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextBunqMeFundraiserResultApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextBunqMeFundraiserResultApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextBunqMeFundraiserResultApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int bunqmeFundraiserResultId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long bunqmeFundraiserResultId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int bunqmeFundraiserResultId, int? moneta
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int bunqmeFundraiserResultId, int noteTextBunqMeFundraiserResultId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long bunqmeFundraiserResultId, long noteTextBunqMeFundraiserResultId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int bunqmeFundraiserResultId, int noteTex
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int bunqmeFundraiserResultId, int noteTextBunqMeFundraiserResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long bunqmeFundraiserResultId, long noteTextBunqMeFundraiserResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int bunqmeFundraiserResultId, int note
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextBunqMeFundraiserResultApiObject>> List(int bunqmeFundraiserResultId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextBunqMeFundraiserResultApiObject>> List(long bunqmeFundraiserResultId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextBunqMeFundraiserResultApiObject>> List(i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextBunqMeFundraiserResultApiObject> Get(int bunqmeFundraiserResultId, int noteTextBunqMeFundraiserResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextBunqMeFundraiserResultApiObject> Get(long bunqmeFundraiserResultId, long noteTextBunqMeFundraiserResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextDraftPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextDraftPaymentApiObject.cs
index a2d22ce..cd78926 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextDraftPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextDraftPaymentApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextDraftPaymentApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextDraftPaymentApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int draftPaymentId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long draftPaymentId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int draftPaymentId, int? monetaryAccountI
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int draftPaymentId, int noteTextDraftPaymentId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long draftPaymentId, long noteTextDraftPaymentId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int draftPaymentId, int noteTextDraftPaym
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int draftPaymentId, int noteTextDraftPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long draftPaymentId, long noteTextDraftPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int draftPaymentId, int noteTextDraftP
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextDraftPaymentApiObject>> List(int draftPaymentId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextDraftPaymentApiObject>> List(long draftPaymentId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextDraftPaymentApiObject>> List(int draftPa
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextDraftPaymentApiObject> Get(int draftPaymentId, int noteTextDraftPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextDraftPaymentApiObject> Get(long draftPaymentId, long noteTextDraftPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextIdealMerchantTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextIdealMerchantTransactionApiObject.cs
index 8e9430f..60ba2a3 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextIdealMerchantTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextIdealMerchantTransactionApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextIdealMerchantTransactionApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextIdealMerchantTransactionApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int idealMerchantTransactionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long idealMerchantTransactionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int idealMerchantTransactionId, int? mone
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int idealMerchantTransactionId, int noteTextIdealMerchantTransactionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long idealMerchantTransactionId, long noteTextIdealMerchantTransactionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int idealMerchantTransactionId, int noteT
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int idealMerchantTransactionId, int noteTextIdealMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long idealMerchantTransactionId, long noteTextIdealMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int idealMerchantTransactionId, int no
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextIdealMerchantTransactionApiObject>> List(int idealMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextIdealMerchantTransactionApiObject>> List(long idealMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextIdealMerchantTransactionApiObject>> List
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextIdealMerchantTransactionApiObject> Get(int idealMerchantTransactionId, int noteTextIdealMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextIdealMerchantTransactionApiObject> Get(long idealMerchantTransactionId, long noteTextIdealMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextMasterCardActionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextMasterCardActionApiObject.cs
index df978c1..3024627 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextMasterCardActionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextMasterCardActionApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextMasterCardActionApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextMasterCardActionApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int mastercardActionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long mastercardActionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int mastercardActionId, int? monetaryAcco
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int mastercardActionId, int noteTextMasterCardActionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long mastercardActionId, long noteTextMasterCardActionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int mastercardActionId, int noteTextMaste
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int mastercardActionId, int noteTextMasterCardActionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long mastercardActionId, long noteTextMasterCardActionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int mastercardActionId, int noteTextMa
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextMasterCardActionApiObject>> List(int mastercardActionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextMasterCardActionApiObject>> List(long mastercardActionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextMasterCardActionApiObject>> List(int mas
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextMasterCardActionApiObject> Get(int mastercardActionId, int noteTextMasterCardActionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextMasterCardActionApiObject> Get(long mastercardActionId, long noteTextMasterCardActionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextOpenBankingMerchantTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextOpenBankingMerchantTransactionApiObject.cs
index 9eccb80..dffdb87 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextOpenBankingMerchantTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextOpenBankingMerchantTransactionApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextOpenBankingMerchantTransactionApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextOpenBankingMerchantTransactionApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int openBankingMerchantTransactionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long openBankingMerchantTransactionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int openBankingMerchantTransactionId, int
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int openBankingMerchantTransactionId, int noteTextOpenBankingMerchantTransactionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long openBankingMerchantTransactionId, long noteTextOpenBankingMerchantTransactionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int openBankingMerchantTransactionId, int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int openBankingMerchantTransactionId, int noteTextOpenBankingMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long openBankingMerchantTransactionId, long noteTextOpenBankingMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -114,7 +114,7 @@ public static BunqResponse<object> Delete(int openBankingMerchantTransactionId,
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NoteTextOpenBankingMerchantTransactionApiObject>> List(int openBankingMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextOpenBankingMerchantTransactionApiObject>> List(long openBankingMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -127,7 +127,7 @@ public static BunqResponse<List<NoteTextOpenBankingMerchantTransactionApiObject>
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextOpenBankingMerchantTransactionApiObject> Get(int openBankingMerchantTransactionId, int noteTextOpenBankingMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextOpenBankingMerchantTransactionApiObject> Get(long openBankingMerchantTransactionId, long noteTextOpenBankingMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentApiObject.cs
index 369bca3..6cb614d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextPaymentApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextPaymentApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int paymentId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long paymentId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int paymentId, int? monetaryAccountId= nu
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int paymentId, int noteTextPaymentId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentId, long noteTextPaymentId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int paymentId, int noteTextPaymentId, int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentId, int noteTextPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long paymentId, long noteTextPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int paymentId, int noteTextPaymentId,
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextPaymentApiObject>> List(int paymentId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextPaymentApiObject>> List(long paymentId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextPaymentApiObject>> List(int paymentId, i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextPaymentApiObject> Get(int paymentId, int noteTextPaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextPaymentApiObject> Get(long paymentId, long noteTextPaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentBatchApiObject.cs
index 963b9de..274b0e9 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentBatchApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextPaymentBatchApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextPaymentBatchApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int paymentBatchId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long paymentBatchId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int paymentBatchId, int? monetaryAccountI
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int paymentBatchId, int noteTextPaymentBatchId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentBatchId, long noteTextPaymentBatchId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int paymentBatchId, int noteTextPaymentBa
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentBatchId, int noteTextPaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long paymentBatchId, long noteTextPaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int paymentBatchId, int noteTextPaymen
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextPaymentBatchApiObject>> List(int paymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextPaymentBatchApiObject>> List(long paymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextPaymentBatchApiObject>> List(int payment
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextPaymentBatchApiObject> Get(int paymentBatchId, int noteTextPaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextPaymentBatchApiObject> Get(long paymentBatchId, long noteTextPaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentDelayedApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentDelayedApiObject.cs
index 578da6b..fc08cd4 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentDelayedApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentDelayedApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextPaymentDelayedApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextPaymentDelayedApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int paymentDelayedId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long paymentDelayedId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int paymentDelayedId, int? monetaryAccoun
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int paymentDelayedId, int noteTextPaymentDelayedId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentDelayedId, long noteTextPaymentDelayedId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int paymentDelayedId, int noteTextPayment
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentDelayedId, int noteTextPaymentDelayedId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long paymentDelayedId, long noteTextPaymentDelayedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -114,7 +114,7 @@ public static BunqResponse<object> Delete(int paymentDelayedId, int noteTextPaym
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NoteTextPaymentDelayedApiObject>> List(int paymentDelayedId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextPaymentDelayedApiObject>> List(long paymentDelayedId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -127,7 +127,7 @@ public static BunqResponse<List<NoteTextPaymentDelayedApiObject>> List(int payme
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextPaymentDelayedApiObject> Get(int paymentDelayedId, int noteTextPaymentDelayedId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextPaymentDelayedApiObject> Get(long paymentDelayedId, long noteTextPaymentDelayedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentSuspendedApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentSuspendedApiObject.cs
new file mode 100644
index 0000000..8f15f3b
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentSuspendedApiObject.cs
@@ -0,0 +1,180 @@
+using Bunq.Sdk.Context;
+using Bunq.Sdk.Http;
+using Bunq.Sdk.Json;
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Text;
+using System;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Used to manage text notes.
+    /// </summary>
+    public class NoteTextPaymentSuspendedApiObject : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment-suspended/{2}/note-text/{3}";
+    
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_CONTENT = "content";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "NoteText";
+    
+        /// <summary>
+        /// The content of the note.
+        /// </summary>
+        [JsonProperty(PropertyName = "content")]
+        public string Content { get; set; }
+        /// <summary>
+        /// The id of the note.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public long? Id { get; set; }
+        /// <summary>
+        /// The timestamp of the note's creation.
+        /// </summary>
+        [JsonProperty(PropertyName = "created")]
+        public string Created { get; set; }
+        /// <summary>
+        /// The timestamp of the note's last update.
+        /// </summary>
+        [JsonProperty(PropertyName = "updated")]
+        public string Updated { get; set; }
+        /// <summary>
+        /// The label of the user who created this note.
+        /// </summary>
+        [JsonProperty(PropertyName = "label_user_creator")]
+        public MonetaryAccountReference LabelUserCreator { get; set; }
+    
+        /// <summary>
+        /// </summary>
+        /// <param name="content">The content of the note.</param>
+        public static BunqResponse<long> Create(long paymentSuspendedId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+    
+            var requestMap = new Dictionary<string, object>
+    {
+    {FIELD_CONTENT, content},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        /// <param name="content">The content of the note.</param>
+        public static BunqResponse<long> Update(long paymentSuspendedId, long noteTextPaymentSuspendedId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+    
+            var requestMap = new Dictionary<string, object>
+    {
+    {FIELD_CONTENT, content},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId, noteTextPaymentSuspendedId), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<object> Delete(long paymentSuspendedId, long noteTextPaymentSuspendedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId, noteTextPaymentSuspendedId), customHeaders);
+    
+            return new BunqResponse<object>(null, responseRaw.Headers);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<List<NoteTextPaymentSuspendedApiObject>> List(long paymentSuspendedId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (urlParams == null) urlParams = new Dictionary<string, string>();
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId), urlParams, customHeaders);
+    
+            return FromJsonList<NoteTextPaymentSuspendedApiObject>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<NoteTextPaymentSuspendedApiObject> Get(long paymentSuspendedId, long noteTextPaymentSuspendedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentSuspendedId, noteTextPaymentSuspendedId), new Dictionary<string, string>(), customHeaders);
+    
+            return FromJson<NoteTextPaymentSuspendedApiObject>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Id != null)
+            {
+                return false;
+            }
+    
+            if (this.Created != null)
+            {
+                return false;
+            }
+    
+            if (this.Updated != null)
+            {
+                return false;
+            }
+    
+            if (this.LabelUserCreator != null)
+            {
+                return false;
+            }
+    
+            if (this.Content != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static NoteTextPaymentSuspendedApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<NoteTextPaymentSuspendedApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryApiObject.cs
index 45cbea6..5fe44d2 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextRequestInquiryApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextRequestInquiryApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int requestInquiryId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long requestInquiryId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int requestInquiryId, int? monetaryAccoun
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int requestInquiryId, int noteTextRequestInquiryId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long requestInquiryId, long noteTextRequestInquiryId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int requestInquiryId, int noteTextRequest
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestInquiryId, int noteTextRequestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long requestInquiryId, long noteTextRequestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int requestInquiryId, int noteTextRequ
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextRequestInquiryApiObject>> List(int requestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextRequestInquiryApiObject>> List(long requestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextRequestInquiryApiObject>> List(int reque
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextRequestInquiryApiObject> Get(int requestInquiryId, int noteTextRequestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextRequestInquiryApiObject> Get(long requestInquiryId, long noteTextRequestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryBatchApiObject.cs
index 2080773..fa38f5d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryBatchApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextRequestInquiryBatchApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextRequestInquiryBatchApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int requestInquiryBatchId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long requestInquiryBatchId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int requestInquiryBatchId, int? monetaryA
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int requestInquiryBatchId, int noteTextRequestInquiryBatchId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long requestInquiryBatchId, long noteTextRequestInquiryBatchId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int requestInquiryBatchId, int noteTextRe
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestInquiryBatchId, int noteTextRequestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long requestInquiryBatchId, long noteTextRequestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int requestInquiryBatchId, int noteTex
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextRequestInquiryBatchApiObject>> List(int requestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextRequestInquiryBatchApiObject>> List(long requestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextRequestInquiryBatchApiObject>> List(int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextRequestInquiryBatchApiObject> Get(int requestInquiryBatchId, int noteTextRequestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextRequestInquiryBatchApiObject> Get(long requestInquiryBatchId, long noteTextRequestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestResponseApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestResponseApiObject.cs
index cfe2a44..54dfc12 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestResponseApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestResponseApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextRequestResponseApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextRequestResponseApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int requestResponseId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long requestResponseId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int requestResponseId, int? monetaryAccou
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int requestResponseId, int noteTextRequestResponseId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long requestResponseId, long noteTextRequestResponseId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int requestResponseId, int noteTextReques
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestResponseId, int noteTextRequestResponseId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long requestResponseId, long noteTextRequestResponseId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int requestResponseId, int noteTextReq
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextRequestResponseApiObject>> List(int requestResponseId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextRequestResponseApiObject>> List(long requestResponseId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextRequestResponseApiObject>> List(int requ
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextRequestResponseApiObject> Get(int requestResponseId, int noteTextRequestResponseId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextRequestResponseApiObject> Get(long requestResponseId, long noteTextRequestResponseId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleInstanceApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleInstanceApiObject.cs
index 0858169..345a8f8 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleInstanceApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleInstanceApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextScheduleInstanceApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextScheduleInstanceApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int scheduleId, int scheduleInstanceId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long scheduleId, long scheduleInstanceId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int scheduleId, int scheduleInstanceId, i
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int scheduleId, int scheduleInstanceId, int noteTextScheduleInstanceId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long scheduleId, long scheduleInstanceId, long noteTextScheduleInstanceId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int scheduleId, int scheduleInstanceId, i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int scheduleId, int scheduleInstanceId, int noteTextScheduleInstanceId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long scheduleId, long scheduleInstanceId, long noteTextScheduleInstanceId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int scheduleId, int scheduleInstanceId
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextScheduleInstanceApiObject>> List(int scheduleId, int scheduleInstanceId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextScheduleInstanceApiObject>> List(long scheduleId, long scheduleInstanceId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextScheduleInstanceApiObject>> List(int sch
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextScheduleInstanceApiObject> Get(int scheduleId, int scheduleInstanceId, int noteTextScheduleInstanceId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextScheduleInstanceApiObject> Get(long scheduleId, long scheduleInstanceId, long noteTextScheduleInstanceId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentApiObject.cs
index 4a7dc93..2fdb692 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextSchedulePaymentApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextSchedulePaymentApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int schedulePaymentId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long schedulePaymentId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int schedulePaymentId, int? monetaryAccou
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int schedulePaymentId, int noteTextSchedulePaymentId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long schedulePaymentId, long noteTextSchedulePaymentId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int schedulePaymentId, int noteTextSchedu
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentId, int noteTextSchedulePaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long schedulePaymentId, long noteTextSchedulePaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int schedulePaymentId, int noteTextSch
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextSchedulePaymentApiObject>> List(int schedulePaymentId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextSchedulePaymentApiObject>> List(long schedulePaymentId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextSchedulePaymentApiObject>> List(int sche
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextSchedulePaymentApiObject> Get(int schedulePaymentId, int noteTextSchedulePaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextSchedulePaymentApiObject> Get(long schedulePaymentId, long noteTextSchedulePaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentBatchApiObject.cs
index ae551ef..223998f 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentBatchApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextSchedulePaymentBatchApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextSchedulePaymentBatchApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int schedulePaymentBatchId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long schedulePaymentBatchId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int schedulePaymentBatchId, int? monetary
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int schedulePaymentBatchId, int noteTextSchedulePaymentBatchId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long schedulePaymentBatchId, long noteTextSchedulePaymentBatchId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int schedulePaymentBatchId, int noteTextS
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int noteTextSchedulePaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long schedulePaymentBatchId, long noteTextSchedulePaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int schedulePaymentBatchId, int noteTe
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextSchedulePaymentBatchApiObject>> List(int schedulePaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextSchedulePaymentBatchApiObject>> List(long schedulePaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextSchedulePaymentBatchApiObject>> List(int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextSchedulePaymentBatchApiObject> Get(int schedulePaymentBatchId, int noteTextSchedulePaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextSchedulePaymentBatchApiObject> Get(long schedulePaymentBatchId, long noteTextSchedulePaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleRequestApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleRequestApiObject.cs
index 47c2212..3436c2f 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleRequestApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleRequestApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextScheduleRequestApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextScheduleRequestApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int scheduleRequestInquiryId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long scheduleRequestInquiryId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int scheduleRequestInquiryId, int? moneta
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int scheduleRequestInquiryId, int noteTextScheduleRequestId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long scheduleRequestInquiryId, long noteTextScheduleRequestId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int scheduleRequestInquiryId, int noteTex
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int scheduleRequestInquiryId, int noteTextScheduleRequestId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long scheduleRequestInquiryId, long noteTextScheduleRequestId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int scheduleRequestInquiryId, int note
         /// <summary>
         /// Manage the notes for a given schedule request.
         /// </summary>
-        public static BunqResponse<List<NoteTextScheduleRequestApiObject>> List(int scheduleRequestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextScheduleRequestApiObject>> List(long scheduleRequestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextScheduleRequestApiObject>> List(int sche
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextScheduleRequestApiObject> Get(int scheduleRequestInquiryId, int noteTextScheduleRequestId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextScheduleRequestApiObject> Get(long scheduleRequestInquiryId, long noteTextScheduleRequestId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleRequestBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleRequestBatchApiObject.cs
index 31f80e0..dd6d862 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleRequestBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleRequestBatchApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextScheduleRequestBatchApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextScheduleRequestBatchApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int scheduleRequestInquiryBatchId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long scheduleRequestInquiryBatchId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int scheduleRequestInquiryBatchId, int? m
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int scheduleRequestInquiryBatchId, int noteTextScheduleRequestBatchId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long scheduleRequestInquiryBatchId, long noteTextScheduleRequestBatchId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int scheduleRequestInquiryBatchId, int no
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int scheduleRequestInquiryBatchId, int noteTextScheduleRequestBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long scheduleRequestInquiryBatchId, long noteTextScheduleRequestBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int scheduleRequestInquiryBatchId, int
         /// <summary>
         /// Manage the notes for a given schedule request.
         /// </summary>
-        public static BunqResponse<List<NoteTextScheduleRequestBatchApiObject>> List(int scheduleRequestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextScheduleRequestBatchApiObject>> List(long scheduleRequestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextScheduleRequestBatchApiObject>> List(int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextScheduleRequestBatchApiObject> Get(int scheduleRequestInquiryBatchId, int noteTextScheduleRequestBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextScheduleRequestBatchApiObject> Get(long scheduleRequestInquiryBatchId, long noteTextScheduleRequestBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextSofortMerchantTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextSofortMerchantTransactionApiObject.cs
index 71e109e..8d30af6 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextSofortMerchantTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextSofortMerchantTransactionApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextSofortMerchantTransactionApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextSofortMerchantTransactionApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int sofortMerchantTransactionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long sofortMerchantTransactionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int sofortMerchantTransactionId, int? mon
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int sofortMerchantTransactionId, int noteTextSofortMerchantTransactionId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long sofortMerchantTransactionId, long noteTextSofortMerchantTransactionId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int sofortMerchantTransactionId, int note
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int sofortMerchantTransactionId, int noteTextSofortMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long sofortMerchantTransactionId, long noteTextSofortMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int sofortMerchantTransactionId, int n
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextSofortMerchantTransactionApiObject>> List(int sofortMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextSofortMerchantTransactionApiObject>> List(long sofortMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextSofortMerchantTransactionApiObject>> Lis
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextSofortMerchantTransactionApiObject> Get(int sofortMerchantTransactionId, int noteTextSofortMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextSofortMerchantTransactionApiObject> Get(long sofortMerchantTransactionId, long noteTextSofortMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextWhitelistResultApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextWhitelistResultApiObject.cs
index e68db03..8afe702 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextWhitelistResultApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextWhitelistResultApiObject.cs
@@ -43,7 +43,7 @@ public class NoteTextWhitelistResultApiObject : BunqModel
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -63,7 +63,7 @@ public class NoteTextWhitelistResultApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Create(int whitelistId, int whitelistResultId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long whitelistId, long whitelistResultId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(int whitelistId, int whitelistResultId, i
         /// <summary>
         /// </summary>
         /// <param name="content">The content of the note.</param>
-        public static BunqResponse<int> Update(int whitelistId, int whitelistResultId, int noteTextWhitelistResultId, int? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long whitelistId, long whitelistResultId, long noteTextWhitelistResultId, long? monetaryAccountId= null, string content = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int whitelistId, int whitelistResultId, i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int whitelistId, int whitelistResultId, int noteTextWhitelistResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long whitelistId, long whitelistResultId, long noteTextWhitelistResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<object> Delete(int whitelistId, int whitelistResultId
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextWhitelistResultApiObject>> List(int whitelistId, int whitelistResultId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextWhitelistResultApiObject>> List(long whitelistId, long whitelistResultId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -128,7 +128,7 @@ public static BunqResponse<List<NoteTextWhitelistResultApiObject>> List(int whit
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextWhitelistResultApiObject> Get(int whitelistId, int whitelistResultId, int noteTextWhitelistResultId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextWhitelistResultApiObject> Get(long whitelistId, long whitelistResultId, long noteTextWhitelistResultId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NotificationFilterFailureApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NotificationFilterFailureApiObject.cs
index b9c88fc..7b75ca0 100644
--- a/BunqSdk/Model/Generated/Endpoint/NotificationFilterFailureApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NotificationFilterFailureApiObject.cs
@@ -55,7 +55,7 @@ public class NotificationFilterFailureApiObject : BunqModel
         /// The object id used to generate the body of the notification.
         /// </summary>
         [JsonProperty(PropertyName = "object_id")]
-        public int? ObjectId { get; set; }
+        public long? ObjectId { get; set; }
         /// <summary>
         /// The exception bunq encountered when processing the callback.
         /// </summary>
@@ -65,12 +65,12 @@ public class NotificationFilterFailureApiObject : BunqModel
         /// The response code (or null) received from the endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "response_code")]
-        public int? ResponseCode { get; set; }
+        public long? ResponseCode { get; set; }
     
         /// <summary>
         /// </summary>
         /// <param name="notificationFilterFailedIds">The IDs to retry.</param>
-        public static BunqResponse<int> Create(string notificationFilterFailedIds, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string notificationFilterFailedIds, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlApiObject.cs
index 9388a86..a1b2c5a 100644
--- a/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlApiObject.cs
@@ -40,7 +40,7 @@ public class NotificationFilterUrlApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="notificationFilters">The types of notifications that will result in a url notification for this user.</param>
-        public static BunqResponse<int> Create(List<NotificationFilterUrlObject> notificationFilters = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(List<NotificationFilterUrlObject> notificationFilters = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlMonetaryAccountApiObject.cs b/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlMonetaryAccountApiObject.cs
index 090554c..afcc026 100644
--- a/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlMonetaryAccountApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlMonetaryAccountApiObject.cs
@@ -40,7 +40,7 @@ public class NotificationFilterUrlMonetaryAccountApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="notificationFilters">The types of notifications that will result in a url notification for this monetary account.</param>
-        public static BunqResponse<int> Create(int? monetaryAccountId= null, List<NotificationFilterUrlObject> notificationFilters = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long? monetaryAccountId= null, List<NotificationFilterUrlObject> notificationFilters = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -59,7 +59,7 @@ public static BunqResponse<int> Create(int? monetaryAccountId= null, List<Notifi
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NotificationFilterUrlMonetaryAccountApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NotificationFilterUrlMonetaryAccountApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/OauthCallbackUrlApiObject.cs b/BunqSdk/Model/Generated/Endpoint/OauthCallbackUrlApiObject.cs
index 9027cc8..ec44ebc 100644
--- a/BunqSdk/Model/Generated/Endpoint/OauthCallbackUrlApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/OauthCallbackUrlApiObject.cs
@@ -41,7 +41,7 @@ public class OauthCallbackUrlApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<OauthCallbackUrlApiObject> Get(int oauthClientId, int oauthCallbackUrlId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<OauthCallbackUrlApiObject> Get(long oauthClientId, long oauthCallbackUrlId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -54,7 +54,7 @@ public static BunqResponse<OauthCallbackUrlApiObject> Get(int oauthClientId, int
         /// <summary>
         /// </summary>
         /// <param name="url">The URL for this callback.</param>
-        public static BunqResponse<int> Create(int oauthClientId, string url, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long oauthClientId, string url, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -74,7 +74,7 @@ public static BunqResponse<int> Create(int oauthClientId, string url, IDictionar
         /// <summary>
         /// </summary>
         /// <param name="url">The URL for this callback.</param>
-        public static BunqResponse<int> Update(int oauthClientId, int oauthCallbackUrlId, string url = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long oauthClientId, long oauthCallbackUrlId, string url = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -93,7 +93,7 @@ public static BunqResponse<int> Update(int oauthClientId, int oauthCallbackUrlId
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<OauthCallbackUrlApiObject>> List(int oauthClientId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<OauthCallbackUrlApiObject>> List(long oauthClientId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -106,7 +106,7 @@ public static BunqResponse<List<OauthCallbackUrlApiObject>> List(int oauthClient
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int oauthClientId, int oauthCallbackUrlId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long oauthClientId, long oauthCallbackUrlId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/OauthClientApiObject.cs b/BunqSdk/Model/Generated/Endpoint/OauthClientApiObject.cs
index f7e6823..07f79a7 100644
--- a/BunqSdk/Model/Generated/Endpoint/OauthClientApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/OauthClientApiObject.cs
@@ -42,7 +42,7 @@ public class OauthClientApiObject : BunqModel
         /// Id of the client.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The display name of this Oauth Client
         /// </summary>
@@ -66,7 +66,7 @@ public class OauthClientApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<OauthClientApiObject> Get(int oauthClientId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<OauthClientApiObject> Get(long oauthClientId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -79,7 +79,7 @@ public static BunqResponse<OauthClientApiObject> Get(int oauthClientId, IDiction
         /// <summary>
         /// </summary>
         /// <param name="status">The status of the Oauth Client, can be ACTIVE or CANCELLED.</param>
-        public static BunqResponse<int> Create(string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -99,7 +99,7 @@ public static BunqResponse<int> Create(string status = null, IDictionary<string,
         /// <summary>
         /// </summary>
         /// <param name="status">The status of the Oauth Client, can be ACTIVE or CANCELLED.</param>
-        public static BunqResponse<int> Update(int oauthClientId, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long oauthClientId, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/PartnerPromotionCashbackApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PartnerPromotionCashbackApiObject.cs
index 0e97bb0..a5323d2 100644
--- a/BunqSdk/Model/Generated/Endpoint/PartnerPromotionCashbackApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PartnerPromotionCashbackApiObject.cs
@@ -34,7 +34,7 @@ public class PartnerPromotionCashbackApiObject : BunqModel
         /// The maximum number of transactions that can be made.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_transaction_maximum")]
-        public int? NumberOfTransactionMaximum { get; set; }
+        public long? NumberOfTransactionMaximum { get; set; }
         /// <summary>
         /// The minimum amount of a transaction.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentApiObject.cs
index e87f59e..a9a6351 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentApiObject.cs
@@ -76,7 +76,7 @@ public class PaymentApiObject : BunqModel
         /// The id of the created Payment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the Payment was done.
         /// </summary>
@@ -92,7 +92,7 @@ public class PaymentApiObject : BunqModel
         /// outgoing Payment).
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The LabelMonetaryAccount containing the public information of 'this' (party) side of the Payment.
         /// </summary>
@@ -142,12 +142,12 @@ public class PaymentApiObject : BunqModel
         /// The id of the PaymentBatch if this Payment was part of one.
         /// </summary>
         [JsonProperty(PropertyName = "batch_id")]
-        public int? BatchId { get; set; }
+        public long? BatchId { get; set; }
         /// <summary>
         /// The id of the JobScheduled if the Payment was scheduled.
         /// </summary>
         [JsonProperty(PropertyName = "scheduled_id")]
-        public int? ScheduledId { get; set; }
+        public long? ScheduledId { get; set; }
         /// <summary>
         /// A shipping Address provided with the Payment, currently unused.
         /// </summary>
@@ -198,7 +198,7 @@ public class PaymentApiObject : BunqModel
         /// <param name="attachment">The Attachments to attach to the Payment.</param>
         /// <param name="merchantReference">Optional data to be included with the Payment specific to the merchant.</param>
         /// <param name="allowBunqto">Whether or not sending a bunq.to payment is allowed.</param>
-        public static BunqResponse<int> Create(AmountObject amount, PointerObject counterpartyAlias, string description, int? monetaryAccountId= null, List<AttachmentMonetaryAccountPaymentObject> attachment = null, string merchantReference = null, bool? allowBunqto = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(AmountObject amount, PointerObject counterpartyAlias, string description, long? monetaryAccountId= null, List<AttachmentMonetaryAccountPaymentObject> attachment = null, string merchantReference = null, bool? allowBunqto = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -223,7 +223,7 @@ public static BunqResponse<int> Create(AmountObject amount, PointerObject counte
         /// <summary>
         /// Get a specific previous Payment.
         /// </summary>
-        public static BunqResponse<PaymentApiObject> Get(int paymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentApiObject> Get(long paymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -236,7 +236,7 @@ public static BunqResponse<PaymentApiObject> Get(int paymentId, int? monetaryAcc
         /// <summary>
         /// Get a listing of all Payments performed on a given MonetaryAccount (incoming and outgoing).
         /// </summary>
-        public static BunqResponse<List<PaymentApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateApiObject.cs
index 2e06e91..15758a4 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateApiObject.cs
@@ -40,7 +40,7 @@ public class PaymentAutoAllocateApiObject : BunqModel
         /// The payment that should be used to define the triggers for the payment auto allocate.
         /// </summary>
         [JsonProperty(PropertyName = "payment_id")]
-        public int? PaymentId { get; set; }
+        public long? PaymentId { get; set; }
         /// <summary>
         /// The type.
         /// </summary>
@@ -55,7 +55,7 @@ public class PaymentAutoAllocateApiObject : BunqModel
         /// The id of the PaymentAutoAllocate.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the PaymentAutoAllocate was created.
         /// </summary>
@@ -97,7 +97,7 @@ public class PaymentAutoAllocateApiObject : BunqModel
         /// <param name="paymentId">The payment that should be used to define the triggers for the payment auto allocate.</param>
         /// <param name="type">Whether a payment should be sorted ONCE or RECURRING.</param>
         /// <param name="definition">The definition of how the money should be allocated.</param>
-        public static BunqResponse<int> Create(int? paymentId, string type, List<PaymentAutoAllocateDefinitionApiObject> definition, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long? paymentId, string type, List<PaymentAutoAllocateDefinitionApiObject> definition, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -118,7 +118,7 @@ public static BunqResponse<int> Create(int? paymentId, string type, List<Payment
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentAutoAllocateApiObject> Get(int paymentAutoAllocateId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentAutoAllocateApiObject> Get(long paymentAutoAllocateId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -130,7 +130,7 @@ public static BunqResponse<PaymentAutoAllocateApiObject> Get(int paymentAutoAllo
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PaymentAutoAllocateApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentAutoAllocateApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -144,7 +144,7 @@ public static BunqResponse<List<PaymentAutoAllocateApiObject>> List(int? monetar
         /// <summary>
         /// </summary>
         /// <param name="definition">The definition of how the money should be allocated.</param>
-        public static BunqResponse<int> Update(int paymentAutoAllocateId, int? monetaryAccountId= null, List<PaymentAutoAllocateDefinitionApiObject> definition = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentAutoAllocateId, long? monetaryAccountId= null, List<PaymentAutoAllocateDefinitionApiObject> definition = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -163,7 +163,7 @@ public static BunqResponse<int> Update(int paymentAutoAllocateId, int? monetaryA
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentAutoAllocateId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long paymentAutoAllocateId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateDefinitionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateDefinitionApiObject.cs
index 2bbbc4c..2c6e448 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateDefinitionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateDefinitionApiObject.cs
@@ -63,7 +63,7 @@ public class PaymentAutoAllocateDefinitionApiObject : BunqModel
         /// The id of the PaymentAutoAllocateDefinition.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the PaymentAutoAllocateDefinition was created.
         /// </summary>
@@ -77,7 +77,7 @@ public class PaymentAutoAllocateDefinitionApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PaymentAutoAllocateDefinitionApiObject>> List(int paymentAutoAllocateId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentAutoAllocateDefinitionApiObject>> List(long paymentAutoAllocateId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateInstanceApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateInstanceApiObject.cs
index 5d64137..c2165e7 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateInstanceApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateInstanceApiObject.cs
@@ -30,7 +30,7 @@ public class PaymentAutoAllocateInstanceApiObject : BunqModel
         /// The id of the PaymentAutoAllocateInstance.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the PaymentAutoAllocateInstance was created.
         /// </summary>
@@ -45,7 +45,7 @@ public class PaymentAutoAllocateInstanceApiObject : BunqModel
         /// The ID of the payment auto allocate this instance belongs to.
         /// </summary>
         [JsonProperty(PropertyName = "payment_auto_allocate_id")]
-        public int? PaymentAutoAllocateId { get; set; }
+        public long? PaymentAutoAllocateId { get; set; }
         /// <summary>
         /// The status of the payment auto allocate instance. SUCCEEDED or FAILED.
         /// </summary>
@@ -65,7 +65,7 @@ public class PaymentAutoAllocateInstanceApiObject : BunqModel
         /// The ID of the payment that triggered the allocating of the payments.
         /// </summary>
         [JsonProperty(PropertyName = "payment_id")]
-        public int? PaymentId { get; set; }
+        public long? PaymentId { get; set; }
         /// <summary>
         /// All Ginmon transaction orders executed with this instance.
         /// </summary>
@@ -74,7 +74,7 @@ public class PaymentAutoAllocateInstanceApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PaymentAutoAllocateInstanceApiObject>> List(int paymentAutoAllocateId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentAutoAllocateInstanceApiObject>> List(long paymentAutoAllocateId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -87,7 +87,7 @@ public static BunqResponse<List<PaymentAutoAllocateInstanceApiObject>> List(int
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentAutoAllocateInstanceApiObject> Get(int paymentAutoAllocateId, int paymentAutoAllocateInstanceId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentAutoAllocateInstanceApiObject> Get(long paymentAutoAllocateId, long paymentAutoAllocateInstanceId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentBatchApiObject.cs
index efcdf51..c419864 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentBatchApiObject.cs
@@ -2,6 +2,7 @@
 using Bunq.Sdk.Http;
 using Bunq.Sdk.Json;
 using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Text;
@@ -26,6 +27,8 @@ public class PaymentBatchApiObject : BunqModel
         /// Field constants.
         /// </summary>
         public const string FIELD_PAYMENTS = "payments";
+        public const string FIELD_EXECUTION_TYPE = "execution_type";
+        public const string FIELD_STATUS = "status";
     
         /// <summary>
         /// Object type.
@@ -37,12 +40,54 @@ public class PaymentBatchApiObject : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "payments")]
         public List<PaymentApiObject> Payments { get; set; }
+        /// <summary>
+        /// Whether the payment batch should be executed synchronously or asynchronously.
+        /// </summary>
+        [JsonProperty(PropertyName = "execution_type")]
+        public string ExecutionType { get; set; }
+        /// <summary>
+        /// The status of the payment batch.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+        /// <summary>
+        /// The ID of the monetary account that this payment batch belongs to.
+        /// </summary>
+        [JsonProperty(PropertyName = "monetary_account_id")]
+        public long? MonetaryAccountId { get; set; }
+        /// <summary>
+        /// The label to display for the monetary account.
+        /// </summary>
+        [JsonProperty(PropertyName = "label")]
+        public MonetaryAccountReference Label { get; set; }
+        /// <summary>
+        /// The total amount of the payment batch.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount_total")]
+        public AmountObject AmountTotal { get; set; }
+        /// <summary>
+        /// The total amount of the successful payments in the batch.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount_successful")]
+        public AmountObject AmountSuccessful { get; set; }
+        /// <summary>
+        /// The ID of the latest event for the payment batch.
+        /// </summary>
+        [JsonProperty(PropertyName = "event_id")]
+        public long? EventId { get; set; }
+        /// <summary>
+        /// The entries that are part of this batch.
+        /// </summary>
+        [JsonProperty(PropertyName = "entries")]
+        public List<PaymentBatchEntryApiObject> Entries { get; set; }
     
         /// <summary>
         /// Create a payment batch by sending an array of single payment objects, that will become part of the batch.
         /// </summary>
         /// <param name="payments">The list of payments we want to send in a single batch.</param>
-        public static BunqResponse<int> Create(List<PaymentApiObject> payments, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        /// <param name="executionType">Whether the payment batch should be executed synchronously or asynchronously.</param>
+        /// <param name="status">The status of the payment batch, used to retry failed payments.</param>
+        public static BunqResponse<long> Create(List<PaymentApiObject> payments, long? monetaryAccountId= null, string executionType = null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -51,6 +96,8 @@ public static BunqResponse<int> Create(List<PaymentApiObject> payments, int? mon
             var requestMap = new Dictionary<string, object>
     {
     {FIELD_PAYMENTS, payments},
+    {FIELD_EXECUTION_TYPE, executionType},
+    {FIELD_STATUS, status},
     };
     
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
@@ -62,7 +109,8 @@ public static BunqResponse<int> Create(List<PaymentApiObject> payments, int? mon
         /// <summary>
         /// Revoke a bunq.to payment batch. The status of all the payments will be set to REVOKED.
         /// </summary>
-        public static BunqResponse<int> Update(int paymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        /// <param name="status">The status of the payment batch, used to retry failed payments.</param>
+        public static BunqResponse<long> Update(long paymentBatchId, long? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -70,6 +118,7 @@ public static BunqResponse<int> Update(int paymentBatchId, int? monetaryAccountI
     
             var requestMap = new Dictionary<string, object>
     {
+    {FIELD_STATUS, status},
     };
     
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
@@ -81,7 +130,7 @@ public static BunqResponse<int> Update(int paymentBatchId, int? monetaryAccountI
         /// <summary>
         /// Return the details of a specific payment batch.
         /// </summary>
-        public static BunqResponse<PaymentBatchApiObject> Get(int paymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentBatchApiObject> Get(long paymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -94,7 +143,7 @@ public static BunqResponse<PaymentBatchApiObject> Get(int paymentBatchId, int? m
         /// <summary>
         /// Return all the payment batches for a monetary account.
         /// </summary>
-        public static BunqResponse<List<PaymentBatchApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentBatchApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -110,11 +159,51 @@ public static BunqResponse<List<PaymentBatchApiObject>> List(int? monetaryAccoun
         /// </summary>
         public override bool IsAllFieldNull()
         {
+            if (this.MonetaryAccountId != null)
+            {
+                return false;
+            }
+    
+            if (this.ExecutionType != null)
+            {
+                return false;
+            }
+    
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.Label != null)
+            {
+                return false;
+            }
+    
+            if (this.AmountTotal != null)
+            {
+                return false;
+            }
+    
+            if (this.AmountSuccessful != null)
+            {
+                return false;
+            }
+    
+            if (this.EventId != null)
+            {
+                return false;
+            }
+    
             if (this.Payments != null)
             {
                 return false;
             }
     
+            if (this.Entries != null)
+            {
+                return false;
+            }
+    
             return true;
         }
     
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentBatchEntryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentBatchEntryApiObject.cs
new file mode 100644
index 0000000..16a0939
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentBatchEntryApiObject.cs
@@ -0,0 +1,162 @@
+using Bunq.Sdk.Context;
+using Bunq.Sdk.Http;
+using Bunq.Sdk.Json;
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Text;
+using System;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Manage entries inside of a payment batch.
+    /// </summary>
+    public class PaymentBatchEntryApiObject : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment-batch/{2}/entry/{3}";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/payment-batch/{2}/entry/{3}";
+    
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_STATUS = "status";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "PaymentBatchEntry";
+    
+        /// <summary>
+        /// The status of the Payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+        /// <summary>
+        /// The ID of the monetary account from which the payment was made.
+        /// </summary>
+        [JsonProperty(PropertyName = "monetary_account_id")]
+        public long? MonetaryAccountId { get; set; }
+        /// <summary>
+        /// The ID of the Payment Batch Entry.
+        /// </summary>
+        [JsonProperty(PropertyName = "payment_batch_id")]
+        public long? PaymentBatchId { get; set; }
+        /// <summary>
+        /// The amount.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount")]
+        public AmountObject Amount { get; set; }
+        /// <summary>
+        /// The pointer to the party where the payment should be made to.
+        /// </summary>
+        [JsonProperty(PropertyName = "counter_pointer")]
+        public MonetaryAccountReference CounterPointer { get; set; }
+        /// <summary>
+        /// The description for the Payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "description")]
+        public string Description { get; set; }
+        /// <summary>
+        /// The payment, if it was made.
+        /// </summary>
+        [JsonProperty(PropertyName = "payment")]
+        public PaymentApiObject Payment { get; set; }
+        /// <summary>
+        /// The errors encountered while executing the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "errors")]
+        public List<ErrorObject> Errors { get; set; }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<PaymentBatchEntryApiObject> Get(long paymentBatchId, long paymentBatchEntryId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId, paymentBatchEntryId), new Dictionary<string, string>(), customHeaders);
+    
+            return FromJson<PaymentBatchEntryApiObject>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+        /// <summary>
+        /// </summary>
+        /// <param name="status">The status of the payment batch, used to retry.</param>
+        public static BunqResponse<long> Update(long paymentBatchId, long paymentBatchEntryId, long? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+    
+            var requestMap = new Dictionary<string, object>
+    {
+    {FIELD_STATUS, status},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId, paymentBatchEntryId), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.MonetaryAccountId != null)
+            {
+                return false;
+            }
+    
+            if (this.PaymentBatchId != null)
+            {
+                return false;
+            }
+    
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.Amount != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterPointer != null)
+            {
+                return false;
+            }
+    
+            if (this.Description != null)
+            {
+                return false;
+            }
+    
+            if (this.Payment != null)
+            {
+                return false;
+            }
+    
+            if (this.Errors != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static PaymentBatchEntryApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<PaymentBatchEntryApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentDelayedApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentDelayedApiObject.cs
new file mode 100644
index 0000000..b3adc63
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentDelayedApiObject.cs
@@ -0,0 +1,129 @@
+using Bunq.Sdk.Context;
+using Bunq.Sdk.Exception;
+using Bunq.Sdk.Http;
+using Bunq.Sdk.Json;
+using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Text;
+using System;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Payments that are not processed yet.
+    /// </summary>
+    public class PaymentDelayedApiObject : BunqModel, IAnchorObjectInterface
+    {
+        /// <summary>
+        /// Error constants.
+        /// </summary>
+        private const string ERROR_NULL_FIELDS = "All fields of an extended model or object are null.";
+    
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/payment-delayed/{2}";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment-delayed/{2}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-delayed";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "PaymentDelayed";
+    
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "PaymentDelayedIncoming")]
+        public PaymentDelayedIncomingApiObject PaymentDelayedIncoming { get; set; }
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "PaymentDelayedOutgoing")]
+        public PaymentDelayedOutgoingApiObject PaymentDelayedOutgoing { get; set; }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<long> Update(long paymentDelayedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+    
+            var requestMap = new Dictionary<string, object>
+    {
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentDelayedId), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<PaymentDelayedApiObject> Get(long paymentDelayedId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentDelayedId), new Dictionary<string, string>(), customHeaders);
+    
+            return FromJson<PaymentDelayedApiObject>(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<List<PaymentDelayedApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        {
+            if (urlParams == null) urlParams = new Dictionary<string, string>();
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
+            return FromJsonList<PaymentDelayedApiObject>(responseRaw);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public BunqModel GetReferencedObject()
+        {
+            if (this.PaymentDelayedIncoming != null)
+            {
+                return this.PaymentDelayedIncoming;
+            }
+    
+            if (this.PaymentDelayedOutgoing != null)
+            {
+                return this.PaymentDelayedOutgoing;
+            }
+    
+            throw new BunqException(ERROR_NULL_FIELDS);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.PaymentDelayedIncoming != null)
+            {
+                return false;
+            }
+    
+            if (this.PaymentDelayedOutgoing != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static PaymentDelayedApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<PaymentDelayedApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentDelayedIncomingApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentDelayedIncomingApiObject.cs
new file mode 100644
index 0000000..b9a7193
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentDelayedIncomingApiObject.cs
@@ -0,0 +1,109 @@
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Payments that are not processed yet.
+    /// </summary>
+    public class PaymentDelayedIncomingApiObject : BunqModel
+    {
+        /// <summary>
+        /// The status of the delayed payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+        /// <summary>
+        /// The id of the monetary account.
+        /// </summary>
+        [JsonProperty(PropertyName = "monetary_account_id")]
+        public long? MonetaryAccountId { get; set; }
+        /// <summary>
+        /// The amount of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount")]
+        public AmountObject Amount { get; set; }
+        /// <summary>
+        /// The LabelMonetaryAccount containing the public information of 'this' (party) side of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias")]
+        public MonetaryAccountReference Alias { get; set; }
+        /// <summary>
+        /// The LabelMonetaryAccount containing the public information of the other (counterparty) side of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "counterparty_alias")]
+        public MonetaryAccountReference CounterpartyAlias { get; set; }
+        /// <summary>
+        /// The description of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "description")]
+        public string Description { get; set; }
+        /// <summary>
+        /// Information about the expected arrival of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "payment_arrival_expected")]
+        public PaymentArrivalExpectedObject PaymentArrivalExpected { get; set; }
+        /// <summary>
+        /// The resulting payment, only when it’s successful.
+        /// </summary>
+        [JsonProperty(PropertyName = "payment_result")]
+        public PaymentApiObject PaymentResult { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountId != null)
+            {
+                return false;
+            }
+    
+            if (this.Amount != null)
+            {
+                return false;
+            }
+    
+            if (this.Alias != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterpartyAlias != null)
+            {
+                return false;
+            }
+    
+            if (this.Description != null)
+            {
+                return false;
+            }
+    
+            if (this.PaymentArrivalExpected != null)
+            {
+                return false;
+            }
+    
+            if (this.PaymentResult != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static PaymentDelayedIncomingApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<PaymentDelayedIncomingApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentDelayedOutgoingApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentDelayedOutgoingApiObject.cs
new file mode 100644
index 0000000..e5b7970
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentDelayedOutgoingApiObject.cs
@@ -0,0 +1,155 @@
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Payments that are not processed yet.
+    /// </summary>
+    public class PaymentDelayedOutgoingApiObject : BunqModel
+    {
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_STATUS = "status";
+    
+    
+        /// <summary>
+        /// The status of the delayed payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+        /// <summary>
+        /// The id of the monetary account.
+        /// </summary>
+        [JsonProperty(PropertyName = "monetary_account_id")]
+        public long? MonetaryAccountId { get; set; }
+        /// <summary>
+        /// The amount of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount")]
+        public AmountObject Amount { get; set; }
+        /// <summary>
+        /// The pointer to which the payment should be sent.
+        /// </summary>
+        [JsonProperty(PropertyName = "counterparty_pointer")]
+        public MonetaryAccountReference CounterpartyPointer { get; set; }
+        /// <summary>
+        /// The LabelMonetaryAccount containing the public information of 'this' (party) side of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias")]
+        public MonetaryAccountReference Alias { get; set; }
+        /// <summary>
+        /// The LabelMonetaryAccount containing the public information of the other (counterparty) side of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "counterparty_alias")]
+        public MonetaryAccountReference CounterpartyAlias { get; set; }
+        /// <summary>
+        /// The description of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "description")]
+        public string Description { get; set; }
+        /// <summary>
+        /// The reason for the payment being delayed.
+        /// </summary>
+        [JsonProperty(PropertyName = "reason")]
+        public string Reason { get; set; }
+        /// <summary>
+        /// The time this payment should be executed.
+        /// </summary>
+        [JsonProperty(PropertyName = "time_execution")]
+        public string TimeExecution { get; set; }
+        /// <summary>
+        /// Information about the expected arrival of the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "payment_arrival_expected")]
+        public PaymentArrivalExpectedObject PaymentArrivalExpected { get; set; }
+        /// <summary>
+        /// The reason why the payment failed.
+        /// </summary>
+        [JsonProperty(PropertyName = "error_message")]
+        public List<ErrorObject> ErrorMessage { get; set; }
+        /// <summary>
+        /// The resulting payment, only when it’s successful.
+        /// </summary>
+        [JsonProperty(PropertyName = "payment_result")]
+        public PaymentApiObject PaymentResult { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountId != null)
+            {
+                return false;
+            }
+    
+            if (this.Amount != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterpartyPointer != null)
+            {
+                return false;
+            }
+    
+            if (this.Alias != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterpartyAlias != null)
+            {
+                return false;
+            }
+    
+            if (this.Description != null)
+            {
+                return false;
+            }
+    
+            if (this.Reason != null)
+            {
+                return false;
+            }
+    
+            if (this.TimeExecution != null)
+            {
+                return false;
+            }
+    
+            if (this.PaymentArrivalExpected != null)
+            {
+                return false;
+            }
+    
+            if (this.ErrorMessage != null)
+            {
+                return false;
+            }
+    
+            if (this.PaymentResult != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static PaymentDelayedOutgoingApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<PaymentDelayedOutgoingApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderCredentialApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderCredentialApiObject.cs
index e898e22..d3bc974 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderCredentialApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderCredentialApiObject.cs
@@ -53,7 +53,7 @@ public class PaymentServiceProviderCredentialApiObject : BunqModel
         /// The id of the credential.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the credential object's creation.
         /// </summary>
@@ -87,7 +87,7 @@ public class PaymentServiceProviderCredentialApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentServiceProviderCredentialApiObject> Get(int paymentServiceProviderCredentialId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentServiceProviderCredentialApiObject> Get(long paymentServiceProviderCredentialId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<PaymentServiceProviderCredentialApiObject> Get(int pa
         /// <param name="clientPaymentServiceProviderCertificate">Payment Services Directive 2 compatible QSEAL certificate</param>
         /// <param name="clientPaymentServiceProviderCertificateChain">Intermediate and root certificate belonging to the provided certificate.</param>
         /// <param name="clientPublicKeySignature">The Base64 encoded signature of the public key provided during installation and with the installation token appended as a nonce. Signed with the private key belonging to the QSEAL certificate.</param>
-        public static BunqResponse<int> Create(string clientPaymentServiceProviderCertificate, string clientPaymentServiceProviderCertificateChain, string clientPublicKeySignature, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string clientPaymentServiceProviderCertificate, string clientPaymentServiceProviderCertificateChain, string clientPublicKeySignature, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderDraftPaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderDraftPaymentApiObject.cs
index c8c3b9e..c40afd3 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderDraftPaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderDraftPaymentApiObject.cs
@@ -89,7 +89,7 @@ public class PaymentServiceProviderDraftPaymentApiObject : BunqModel
         /// <param name="amount">The Amount to transfer with the Payment. Must be bigger than 0.</param>
         /// <param name="senderName">The name of the sender.</param>
         /// <param name="status">The new status of the Draft Payment. Can only be set to REJECTED or CANCELLED by update.</param>
-        public static BunqResponse<int> Create(string senderIban, string counterpartyIban, string counterpartyName, string description, AmountObject amount, string senderName = null, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string senderIban, string counterpartyIban, string counterpartyName, string description, AmountObject amount, string senderName = null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -115,7 +115,7 @@ public static BunqResponse<int> Create(string senderIban, string counterpartyIba
         /// <summary>
         /// </summary>
         /// <param name="status">The new status of the Draft Payment. Can only be set to REJECTED or CANCELLED by update.</param>
-        public static BunqResponse<int> Update(int paymentServiceProviderDraftPaymentId, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentServiceProviderDraftPaymentId, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -147,7 +147,7 @@ public static BunqResponse<List<PaymentServiceProviderDraftPaymentApiObject>> Li
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentServiceProviderDraftPaymentApiObject> Get(int paymentServiceProviderDraftPaymentId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentServiceProviderDraftPaymentApiObject> Get(long paymentServiceProviderDraftPaymentId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderIssuerTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderIssuerTransactionApiObject.cs
index 4e5a075..0925472 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderIssuerTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderIssuerTransactionApiObject.cs
@@ -72,7 +72,7 @@ public class PaymentServiceProviderIssuerTransactionApiObject : BunqModel
         /// The id of this transaction.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The time this transaction was created.
         /// </summary>
@@ -102,7 +102,7 @@ public class PaymentServiceProviderIssuerTransactionApiObject : BunqModel
         /// <param name="urlRedirect">The url to which the user should be redirected once the transaction is accepted or rejected.</param>
         /// <param name="timeExpiry">The (optional) expiration time of the transaction. Defaults to 10 minutes.</param>
         /// <param name="status">The status of the transaction. Can only be used for cancelling the transaction.</param>
-        public static BunqResponse<int> Create(PointerObject counterpartyAlias, AmountObject amount, string description, string urlRedirect, string timeExpiry = null, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(PointerObject counterpartyAlias, AmountObject amount, string description, string urlRedirect, string timeExpiry = null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -126,7 +126,7 @@ public static BunqResponse<int> Create(PointerObject counterpartyAlias, AmountOb
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentServiceProviderIssuerTransactionApiObject> Get(int paymentServiceProviderIssuerTransactionId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentServiceProviderIssuerTransactionApiObject> Get(long paymentServiceProviderIssuerTransactionId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -139,7 +139,7 @@ public static BunqResponse<PaymentServiceProviderIssuerTransactionApiObject> Get
         /// <summary>
         /// </summary>
         /// <param name="status">The status of the transaction. Can only be used for cancelling the transaction.</param>
-        public static BunqResponse<int> Update(int paymentServiceProviderIssuerTransactionId, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long paymentServiceProviderIssuerTransactionId, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/PermittedIpApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PermittedIpApiObject.cs
index 8bba62b..6c21c35 100644
--- a/BunqSdk/Model/Generated/Endpoint/PermittedIpApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PermittedIpApiObject.cs
@@ -47,7 +47,7 @@ public class PermittedIpApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<PermittedIpApiObject> Get(int credentialPasswordIpId, int permittedIpId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PermittedIpApiObject> Get(long credentialPasswordIpId, long permittedIpId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -61,7 +61,7 @@ public static BunqResponse<PermittedIpApiObject> Get(int credentialPasswordIpId,
         /// </summary>
         /// <param name="ip">The IP address.</param>
         /// <param name="status">The status of the IP. May be "ACTIVE" or "INACTIVE". It is only possible to make requests from "ACTIVE" IP addresses. Only "ACTIVE" IPs will be billed.</param>
-        public static BunqResponse<int> Create(int credentialPasswordIpId, string ip, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long credentialPasswordIpId, string ip, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -81,7 +81,7 @@ public static BunqResponse<int> Create(int credentialPasswordIpId, string ip, st
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PermittedIpApiObject>> List(int credentialPasswordIpId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PermittedIpApiObject>> List(long credentialPasswordIpId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -95,7 +95,7 @@ public static BunqResponse<List<PermittedIpApiObject>> List(int credentialPasswo
         /// <summary>
         /// </summary>
         /// <param name="status">The status of the IP. May be "ACTIVE" or "INACTIVE". It is only possible to make requests from "ACTIVE" IP addresses. Only "ACTIVE" IPs will be billed.</param>
-        public static BunqResponse<int> Update(int credentialPasswordIpId, int permittedIpId, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long credentialPasswordIpId, long permittedIpId, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/PointMutationApiObject.cs b/BunqSdk/Model/Generated/Endpoint/PointMutationApiObject.cs
index 1e83088..763fb8f 100644
--- a/BunqSdk/Model/Generated/Endpoint/PointMutationApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PointMutationApiObject.cs
@@ -13,7 +13,7 @@ public class PointMutationApiObject : BunqModel
         /// The number of points earned.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_point")]
-        public int? NumberOfPoint { get; set; }
+        public long? NumberOfPoint { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RegistryApiObject.cs
new file mode 100644
index 0000000..b21a291
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/RegistryApiObject.cs
@@ -0,0 +1,307 @@
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Initially used to manage Slice groups, now it is used to manage Tricounts
+    /// </summary>
+    public class RegistryApiObject : BunqModel
+    {
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_UPDATED = "updated";
+        public const string FIELD_UUID = "uuid";
+        public const string FIELD_PUBLIC_IDENTIFIER_TOKEN = "public_identifier_token";
+        public const string FIELD_CURRENCY = "currency";
+        public const string FIELD_TITLE = "title";
+        public const string FIELD_DESCRIPTION = "description";
+        public const string FIELD_CATEGORY = "category";
+        public const string FIELD_STATUS = "status";
+        public const string FIELD_LAST_REGISTRY_ENTRY_SEEN_ID = "last_registry_entry_seen_id";
+        public const string FIELD_PREVIOUS_UPDATED_TIMESTAMP = "previous_updated_timestamp";
+        public const string FIELD_MEMBERSHIP_UUID_ACTIVE = "membership_uuid_active";
+        public const string FIELD_MEMBERSHIPS = "memberships";
+        public const string FIELD_MEMBERSHIPS_PREVIOUS = "memberships_previous";
+        public const string FIELD_DELETED_MEMBERSHIP_IDS = "deleted_membership_ids";
+        public const string FIELD_AUTO_ADD_CARD_TRANSACTION = "auto_add_card_transaction";
+        public const string FIELD_MEMBERSHIP_SETTING = "membership_setting";
+        public const string FIELD_AVATAR_UUID = "avatar_uuid";
+        public const string FIELD_SETTING = "setting";
+        public const string FIELD_ALL_REGISTRY_ENTRY = "all_registry_entry";
+        public const string FIELD_ALIAS_CREATOR = "alias_creator";
+        public const string FIELD_EMOJI = "emoji";
+    
+    
+        /// <summary>
+        /// The timestamp of the Registry's last update.
+        /// </summary>
+        [JsonProperty(PropertyName = "updated")]
+        public string Updated { get; set; }
+        /// <summary>
+        /// The uuid of the Registry. If it was provided by the client on creation, then the client can use it to match
+        /// the returned Registry to the row stored locally.
+        /// </summary>
+        [JsonProperty(PropertyName = "uuid")]
+        public string Uuid { get; set; }
+        /// <summary>
+        /// Public identifier token provided by the client. Will remain null if not provided in the POST call.
+        /// </summary>
+        [JsonProperty(PropertyName = "public_identifier_token")]
+        public string PublicIdentifierToken { get; set; }
+        /// <summary>
+        /// The currency for the Registry as an ISO 4217 formatted currency code.
+        /// </summary>
+        [JsonProperty(PropertyName = "currency")]
+        public string Currency { get; set; }
+        /// <summary>
+        /// The title of the Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "title")]
+        public string Title { get; set; }
+        /// <summary>
+        /// A description about the Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "description")]
+        public string Description { get; set; }
+        /// <summary>
+        /// The category of the Registry. Can be one of the following values: GENERAL, TRIP, SHARED_HOUSE, COUPLE,
+        /// EVENT, PROJECT, OTHER
+        /// </summary>
+        [JsonProperty(PropertyName = "category")]
+        public string Category { get; set; }
+        /// <summary>
+        /// The status of the Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+        /// <summary>
+        /// The id of the last RegistryEntry that the user has seen.
+        /// </summary>
+        [JsonProperty(PropertyName = "last_registry_entry_seen_id")]
+        public long? LastRegistryEntrySeenId { get; set; }
+        /// <summary>
+        /// The previous updated timestamp that you received for this Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "previous_updated_timestamp")]
+        public string PreviousUpdatedTimestamp { get; set; }
+        /// <summary>
+        /// The UUID of the membership which is currently linked to the logged in user.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_uuid_active")]
+        public string MembershipUuidActive { get; set; }
+        /// <summary>
+        /// List of memberships to replace the current one.
+        /// </summary>
+        [JsonProperty(PropertyName = "memberships")]
+        public List<RegistryMembershipApiObject> Memberships { get; set; }
+        /// <summary>
+        /// Previous list of memberships.
+        /// </summary>
+        [JsonProperty(PropertyName = "memberships_previous")]
+        public List<RegistryMembershipApiObject> MembershipsPrevious { get; set; }
+        /// <summary>
+        /// The ids of the memberships that have been deleted.
+        /// </summary>
+        [JsonProperty(PropertyName = "deleted_membership_ids")]
+        public List<string> DeletedMembershipIds { get; set; }
+        /// <summary>
+        /// The setting for adding automatically card transactions to the registry for the creator. (deprecated)
+        /// </summary>
+        [JsonProperty(PropertyName = "auto_add_card_transaction")]
+        public string AutoAddCardTransaction { get; set; }
+        /// <summary>
+        /// User creator registry membership setting.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_setting")]
+        public RegistryMembershipSettingObject MembershipSetting { get; set; }
+        /// <summary>
+        /// The UUID of the avatar. Use the calls /attachment-public and /avatar to create a new Avatar and get its
+        /// UUID.
+        /// </summary>
+        [JsonProperty(PropertyName = "avatar_uuid")]
+        public string AvatarUuid { get; set; }
+        /// <summary>
+        /// The settings for this Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "setting")]
+        public RegistrySettingApiObject Setting { get; set; }
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "all_registry_entry")]
+        public List<RegistryEntryApiObject> AllRegistryEntry { get; set; }
+        /// <summary>
+        /// The alias of the creator, so we can send a confirmation even when the creator doesn't yet have an alias
+        /// saved for their user.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias_creator")]
+        public MonetaryAccountReference AliasCreator { get; set; }
+        /// <summary>
+        /// The emoji of the registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "emoji")]
+        public string Emoji { get; set; }
+        /// <summary>
+        /// The id of the Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public long? Id { get; set; }
+        /// <summary>
+        /// The timestamp of the Registry's creation.
+        /// </summary>
+        [JsonProperty(PropertyName = "created")]
+        public string Created { get; set; }
+        /// <summary>
+        /// The total amount spent in this Registry since the last settlement.
+        /// </summary>
+        [JsonProperty(PropertyName = "total_amount_spent")]
+        public AmountObject TotalAmountSpent { get; set; }
+        /// <summary>
+        /// Whether the Registry has previously been settled.
+        /// </summary>
+        [JsonProperty(PropertyName = "is_previously_settled")]
+        public bool? IsPreviouslySettled { get; set; }
+        /// <summary>
+        /// The registry's avatar.
+        /// </summary>
+        [JsonProperty(PropertyName = "avatar")]
+        public AvatarObject Avatar { get; set; }
+        /// <summary>
+        /// The optional ID of the last settlement of this activity.
+        /// </summary>
+        [JsonProperty(PropertyName = "last_settlement_id")]
+        public long? LastSettlementId { get; set; }
+        /// <summary>
+        /// The timestamp of the latest activity seen for this registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "last_activity_timestamp")]
+        public string LastActivityTimestamp { get; set; }
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "all_registry_gallery_attachment")]
+        public List<RegistryGalleryAttachmentApiObject> AllRegistryGalleryAttachment { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Id != null)
+            {
+                return false;
+            }
+    
+            if (this.Uuid != null)
+            {
+                return false;
+            }
+    
+            if (this.PublicIdentifierToken != null)
+            {
+                return false;
+            }
+    
+            if (this.Created != null)
+            {
+                return false;
+            }
+    
+            if (this.Updated != null)
+            {
+                return false;
+            }
+    
+            if (this.Currency != null)
+            {
+                return false;
+            }
+    
+            if (this.Emoji != null)
+            {
+                return false;
+            }
+    
+            if (this.Title != null)
+            {
+                return false;
+            }
+    
+            if (this.Description != null)
+            {
+                return false;
+            }
+    
+            if (this.Category != null)
+            {
+                return false;
+            }
+    
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.TotalAmountSpent != null)
+            {
+                return false;
+            }
+    
+            if (this.IsPreviouslySettled != null)
+            {
+                return false;
+            }
+    
+            if (this.MembershipUuidActive != null)
+            {
+                return false;
+            }
+    
+            if (this.Memberships != null)
+            {
+                return false;
+            }
+    
+            if (this.Setting != null)
+            {
+                return false;
+            }
+    
+            if (this.Avatar != null)
+            {
+                return false;
+            }
+    
+            if (this.LastSettlementId != null)
+            {
+                return false;
+            }
+    
+            if (this.LastActivityTimestamp != null)
+            {
+                return false;
+            }
+    
+            if (this.AllRegistryEntry != null)
+            {
+                return false;
+            }
+    
+            if (this.AllRegistryGalleryAttachment != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistryApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistryApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistryEntryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RegistryEntryApiObject.cs
new file mode 100644
index 0000000..dbf6464
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/RegistryEntryApiObject.cs
@@ -0,0 +1,305 @@
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Used to manage Slice group payment.
+    /// </summary>
+    public class RegistryEntryApiObject : BunqModel
+    {
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_ID = "id";
+        public const string FIELD_UUID = "uuid";
+        public const string FIELD_UPDATED = "updated";
+        public const string FIELD_STATUS = "status";
+        public const string FIELD_MEMBERSHIP_UUID_OWNER = "membership_uuid_owner";
+        public const string FIELD_MEMBERSHIP_TRICOUNT_ID_OWNER = "membership_tricount_id_owner";
+        public const string FIELD_ALIAS_OWNER = "alias_owner";
+        public const string FIELD_AMOUNT = "amount";
+        public const string FIELD_AMOUNT_LOCAL = "amount_local";
+        public const string FIELD_EXCHANGE_RATE = "exchange_rate";
+        public const string FIELD_OBJECT_REFERENCE = "object_reference";
+        public const string FIELD_DESCRIPTION = "description";
+        public const string FIELD_ALLOCATIONS = "allocations";
+        public const string FIELD_ATTACHMENT = "attachment";
+        public const string FIELD_CATEGORY = "category";
+        public const string FIELD_CATEGORY_CUSTOM = "category_custom";
+        public const string FIELD_DATE = "date";
+        public const string FIELD_TYPE_TRANSACTION = "type_transaction";
+        public const string FIELD_TRICOUNT_ID = "tricount_id";
+    
+    
+        /// <summary>
+        /// The id of the RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public long? Id { get; set; }
+        /// <summary>
+        /// The uuid of the RegistryEntry. If it was provided by the client on creation, then the client can use it to
+        /// match the returned RegistryEntry to the row stored locally.
+        /// </summary>
+        [JsonProperty(PropertyName = "uuid")]
+        public string Uuid { get; set; }
+        /// <summary>
+        /// The timestamp of the RegistryEntry's last update.
+        /// </summary>
+        [JsonProperty(PropertyName = "updated")]
+        public string Updated { get; set; }
+        /// <summary>
+        /// The status of the RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+        /// <summary>
+        /// The UUID of the RegistryMembership of the party we are allocating money for. Can be provided instead of the
+        /// "alias_owner" field.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_uuid_owner")]
+        public string MembershipUuidOwner { get; set; }
+        /// <summary>
+        /// The original tricount id of the membership for backwards compatibility, to ensure clients are able to sync
+        /// updates to transactions made offline before the Tricount migration to the bunq backend.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_tricount_id_owner")]
+        public long? MembershipTricountIdOwner { get; set; }
+        /// <summary>
+        /// The Alias of the party we are allocating money for.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias_owner")]
+        public MonetaryAccountReference AliasOwner { get; set; }
+        /// <summary>
+        /// The Amount of the RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount")]
+        public AmountObject Amount { get; set; }
+        /// <summary>
+        /// The Amount of the RegistryEntry in a local currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount_local")]
+        public AmountObject AmountLocal { get; set; }
+        /// <summary>
+        /// The exchange rate used to convert between amount and amount_local.
+        /// </summary>
+        [JsonProperty(PropertyName = "exchange_rate")]
+        public string ExchangeRate { get; set; }
+        /// <summary>
+        /// The object linked to the RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "object_reference")]
+        public RegistryEntryReferenceObject ObjectReference { get; set; }
+        /// <summary>
+        /// A description about the RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "description")]
+        public string Description { get; set; }
+        /// <summary>
+        /// An array of AllocationItems.
+        /// </summary>
+        [JsonProperty(PropertyName = "allocations")]
+        public List<AllocationItemObject> Allocations { get; set; }
+        /// <summary>
+        /// The attachments attached to the payment.
+        /// </summary>
+        [JsonProperty(PropertyName = "attachment")]
+        public List<RegistryEntryAttachmentObject> Attachment { get; set; }
+        /// <summary>
+        /// The category of this RegistryEntry. Supported values: UNCATEGORIZED, OTHER, ACCOMODATION, ENTERTAINMENT,
+        /// GROCERIES, HEALTHCARE, INSURANCE, RENT, RESTAURANTS, SHOPPING, TRANSPORT
+        /// </summary>
+        [JsonProperty(PropertyName = "category")]
+        public string Category { get; set; }
+        /// <summary>
+        /// A custom user-provided category description for this RegistryEntry. Only allowed if `category` is set to
+        /// "OTHER".
+        /// </summary>
+        [JsonProperty(PropertyName = "category_custom")]
+        public string CategoryCustom { get; set; }
+        /// <summary>
+        /// A user provided date for this RegistryEntry. Returns a full timestamp to allow apps to also use this to sort
+        /// transactions client-side.
+        /// </summary>
+        [JsonProperty(PropertyName = "date")]
+        public string Date { get; set; }
+        /// <summary>
+        /// The RegistryEntry transaction type. NORMAL, INCOME, or BALANCE.
+        /// </summary>
+        [JsonProperty(PropertyName = "type_transaction")]
+        public string TypeTransaction { get; set; }
+        /// <summary>
+        /// The original tricount id for backwards compatibility, to ensure clients are able to sync updates to
+        /// transactions made offline before the Tricount migration to the bunq backend.
+        /// </summary>
+        [JsonProperty(PropertyName = "tricount_id")]
+        public long? TricountId { get; set; }
+        /// <summary>
+        /// The timestamp of the RegistryEntry's creation.
+        /// </summary>
+        [JsonProperty(PropertyName = "created")]
+        public string Created { get; set; }
+        /// <summary>
+        /// The id of the Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "registry_id")]
+        public long? RegistryId { get; set; }
+        /// <summary>
+        /// The RegistryEntry type. AUTO if created by Auto Slice, MANUAL for manually added entries.
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+        /// <summary>
+        /// The LabelUser with the public information of the party of this RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias")]
+        public MonetaryAccountReference Alias { get; set; }
+        /// <summary>
+        /// The LabelUser with the public information of the counter party of this RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "counterparty_alias")]
+        public MonetaryAccountReference CounterpartyAlias { get; set; }
+        /// <summary>
+        /// The LabelUser with the public information of the User that created the RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "user_alias_created")]
+        public MonetaryAccountReference UserAliasCreated { get; set; }
+        /// <summary>
+        /// The membership of the creator.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_created")]
+        public RegistryMembershipApiObject MembershipCreated { get; set; }
+        /// <summary>
+        /// The membership of the owner.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_owned")]
+        public RegistryMembershipApiObject MembershipOwned { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Id != null)
+            {
+                return false;
+            }
+    
+            if (this.Uuid != null)
+            {
+                return false;
+            }
+    
+            if (this.Created != null)
+            {
+                return false;
+            }
+    
+            if (this.Updated != null)
+            {
+                return false;
+            }
+    
+            if (this.RegistryId != null)
+            {
+                return false;
+            }
+    
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.Amount != null)
+            {
+                return false;
+            }
+    
+            if (this.AmountLocal != null)
+            {
+                return false;
+            }
+    
+            if (this.ExchangeRate != null)
+            {
+                return false;
+            }
+    
+            if (this.Description != null)
+            {
+                return false;
+            }
+    
+            if (this.Type != null)
+            {
+                return false;
+            }
+    
+            if (this.TypeTransaction != null)
+            {
+                return false;
+            }
+    
+            if (this.Alias != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterpartyAlias != null)
+            {
+                return false;
+            }
+    
+            if (this.UserAliasCreated != null)
+            {
+                return false;
+            }
+    
+            if (this.MembershipCreated != null)
+            {
+                return false;
+            }
+    
+            if (this.MembershipOwned != null)
+            {
+                return false;
+            }
+    
+            if (this.Allocations != null)
+            {
+                return false;
+            }
+    
+            if (this.Attachment != null)
+            {
+                return false;
+            }
+    
+            if (this.Category != null)
+            {
+                return false;
+            }
+    
+            if (this.CategoryCustom != null)
+            {
+                return false;
+            }
+    
+            if (this.Date != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistryEntryApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistryEntryApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistryGalleryAttachmentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RegistryGalleryAttachmentApiObject.cs
new file mode 100644
index 0000000..506071c
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/RegistryGalleryAttachmentApiObject.cs
@@ -0,0 +1,59 @@
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// This call is used to upload an photo that is accessible by all members of a registry.
+    /// </summary>
+    public class RegistryGalleryAttachmentApiObject : BunqModel
+    {
+        /// <summary>
+        /// The id of the user owner.
+        /// </summary>
+        [JsonProperty(PropertyName = "user_id")]
+        public long? UserId { get; set; }
+        /// <summary>
+        /// The attachment.
+        /// </summary>
+        [JsonProperty(PropertyName = "attachment")]
+        public AttachmentObject Attachment { get; set; }
+        /// <summary>
+        /// The membership of the owner uuid.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_uuid")]
+        public string MembershipUuid { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.UserId != null)
+            {
+                return false;
+            }
+    
+            if (this.Attachment != null)
+            {
+                return false;
+            }
+    
+            if (this.MembershipUuid != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistryGalleryAttachmentApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistryGalleryAttachmentApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistryImportSplitwiseCsvApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RegistryImportSplitwiseCsvApiObject.cs
new file mode 100644
index 0000000..afc8002
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/RegistryImportSplitwiseCsvApiObject.cs
@@ -0,0 +1,71 @@
+using Bunq.Sdk.Context;
+using Bunq.Sdk.Http;
+using Bunq.Sdk.Json;
+using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Text;
+using System;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Used to upload a CSV export from Splitwise, and create a new Registry from it.
+    /// </summary>
+    public class RegistryImportSplitwiseCsvApiObject : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/registry-import-splitwise-csv";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_POST = "RegistryImport";
+    
+        /// <summary>
+        /// The registry details.
+        /// </summary>
+        [JsonProperty(PropertyName = "registry")]
+        public RegistryApiObject Registry { get; set; }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<RegistryImportSplitwiseCsvApiObject> Create( IDictionary<string, string> customHeaders = null)
+        {
+            if (customHeaders == null) customHeaders = new Dictionary<string, string>();
+    
+            var apiClient = new ApiClient(GetApiContext());
+    
+            var requestMap = new Dictionary<string, object>
+    {
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
+            return FromJson<RegistryImportSplitwiseCsvApiObject>(responseRaw, OBJECT_TYPE_POST);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Registry != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistryImportSplitwiseCsvApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistryImportSplitwiseCsvApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistryMembershipApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RegistryMembershipApiObject.cs
new file mode 100644
index 0000000..52a7a8b
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/RegistryMembershipApiObject.cs
@@ -0,0 +1,167 @@
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// View for RegistryMembership.
+    /// </summary>
+    public class RegistryMembershipApiObject : BunqModel
+    {
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_UUID = "uuid";
+        public const string FIELD_ALIAS = "alias";
+        public const string FIELD_STATUS = "status";
+        public const string FIELD_AUTO_ADD_CARD_TRANSACTION = "auto_add_card_transaction";
+        public const string FIELD_SETTING = "setting";
+        public const string FIELD_MEMBERSHIP_TICOUNT_ID = "membership_ticount_id";
+    
+    
+        /// <summary>
+        /// The UUID of the membership.
+        /// </summary>
+        [JsonProperty(PropertyName = "uuid")]
+        public string Uuid { get; set; }
+        /// <summary>
+        /// The LabelMonetaryAccount of the user who belongs to this RegistryMembership.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias")]
+        public MonetaryAccountReference Alias { get; set; }
+        /// <summary>
+        /// The status of the RegistryMembership.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+        /// <summary>
+        /// The setting for adding automatically card transactions to the registry. (deprecated)
+        /// </summary>
+        [JsonProperty(PropertyName = "auto_add_card_transaction")]
+        public string AutoAddCardTransaction { get; set; }
+        /// <summary>
+        /// Registry membership setting.
+        /// </summary>
+        [JsonProperty(PropertyName = "setting")]
+        public RegistryMembershipSettingObject Setting { get; set; }
+        /// <summary>
+        /// The original TricountId of the membership for backwards compatibility. May be used as an alternative to the
+        /// UUID to identify specific memberships to allow clients to sync changes made offline before the Tricount
+        /// migration.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_ticount_id")]
+        public long? MembershipTicountId { get; set; }
+        /// <summary>
+        /// The balance of this RegistryMembership.
+        /// </summary>
+        [JsonProperty(PropertyName = "balance")]
+        public AmountObject Balance { get; set; }
+        /// <summary>
+        /// The total amount spent of this RegistryMembership.
+        /// </summary>
+        [JsonProperty(PropertyName = "total_amount_spent")]
+        public AmountObject TotalAmountSpent { get; set; }
+        /// <summary>
+        /// The status of the settlement of the Registry. Can be PENDING or SETTLED.
+        /// </summary>
+        [JsonProperty(PropertyName = "status_settlement")]
+        public string StatusSettlement { get; set; }
+        /// <summary>
+        /// The registry id.
+        /// </summary>
+        [JsonProperty(PropertyName = "registry_id")]
+        public long? RegistryId { get; set; }
+        /// <summary>
+        /// The registry title.
+        /// </summary>
+        [JsonProperty(PropertyName = "registry_title")]
+        public string RegistryTitle { get; set; }
+        /// <summary>
+        /// For dinner and grocery expenses.
+        /// </summary>
+        [JsonProperty(PropertyName = "registry_description")]
+        public string RegistryDescription { get; set; }
+        /// <summary>
+        /// The label of the user that sent the invite.
+        /// </summary>
+        [JsonProperty(PropertyName = "invitor")]
+        public MonetaryAccountReference Invitor { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Uuid != null)
+            {
+                return false;
+            }
+    
+            if (this.Alias != null)
+            {
+                return false;
+            }
+    
+            if (this.Balance != null)
+            {
+                return false;
+            }
+    
+            if (this.TotalAmountSpent != null)
+            {
+                return false;
+            }
+    
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.StatusSettlement != null)
+            {
+                return false;
+            }
+    
+            if (this.AutoAddCardTransaction != null)
+            {
+                return false;
+            }
+    
+            if (this.Setting != null)
+            {
+                return false;
+            }
+    
+            if (this.RegistryId != null)
+            {
+                return false;
+            }
+    
+            if (this.RegistryTitle != null)
+            {
+                return false;
+            }
+    
+            if (this.RegistryDescription != null)
+            {
+                return false;
+            }
+    
+            if (this.Invitor != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistryMembershipApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistryMembershipApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistrySettingApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RegistrySettingApiObject.cs
new file mode 100644
index 0000000..8aea67a
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/RegistrySettingApiObject.cs
@@ -0,0 +1,72 @@
+using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Endpoint
+{
+    /// <summary>
+    /// Used to manage Slice group settings.
+    /// </summary>
+    public class RegistrySettingApiObject : BunqModel
+    {
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_COLOR = "color";
+        public const string FIELD_ICON = "icon";
+        public const string FIELD_DEFAULT_AVATAR_STATUS = "default_avatar_status";
+        public const string FIELD_SDD_EXPIRATION_ACTION = "sdd_expiration_action";
+    
+    
+        /// <summary>
+        /// The color chosen for the Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "color")]
+        public string Color { get; set; }
+        /// <summary>
+        /// The icon chosen for the Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "icon")]
+        public string Icon { get; set; }
+        /// <summary>
+        /// The status of the avatar. Can be either AVATAR_DEFAULT, AVATAR_CUSTOM, AVATAR_ICON or AVATAR_UNDETERMINED.
+        /// </summary>
+        [JsonProperty(PropertyName = "default_avatar_status")]
+        public string DefaultAvatarStatus { get; set; }
+        /// <summary>
+        /// A monetaryAccountSetting field that should not be here, added for app support.
+        /// </summary>
+        [JsonProperty(PropertyName = "sdd_expiration_action")]
+        public string SddExpirationAction { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Color != null)
+            {
+                return false;
+            }
+    
+            if (this.Icon != null)
+            {
+                return false;
+            }
+    
+            if (this.DefaultAvatarStatus != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistrySettingApiObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistrySettingApiObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RelationUserApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RelationUserApiObject.cs
index 2698a56..c002895 100644
--- a/BunqSdk/Model/Generated/Endpoint/RelationUserApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RelationUserApiObject.cs
@@ -41,16 +41,36 @@ public class RelationUserApiObject : BunqModel
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
         /// <summary>
-        /// The account status of a user
+        /// The account status of a user.
         /// </summary>
         [JsonProperty(PropertyName = "user_status")]
         public string UserStatus { get; set; }
         /// <summary>
-        /// The account status of a user
+        /// The account sub-status of the user.
+        /// </summary>
+        [JsonProperty(PropertyName = "user_sub_status")]
+        public string UserSubStatus { get; set; }
+        /// <summary>
+        /// The account verification status of the user.
+        /// </summary>
+        [JsonProperty(PropertyName = "user_verification_status")]
+        public string UserVerificationStatus { get; set; }
+        /// <summary>
+        /// The account sub-status of the counter user.
         /// </summary>
         [JsonProperty(PropertyName = "counter_user_status")]
         public string CounterUserStatus { get; set; }
         /// <summary>
+        /// The account sub-status of the counter user.
+        /// </summary>
+        [JsonProperty(PropertyName = "counter_user_sub_status")]
+        public string CounterUserSubStatus { get; set; }
+        /// <summary>
+        /// The account verification status of the counter user.
+        /// </summary>
+        [JsonProperty(PropertyName = "counter_user_verification_status")]
+        public string CounterUserVerificationStatus { get; set; }
+        /// <summary>
         /// Tap to Pay settings for the company employee.
         /// </summary>
         [JsonProperty(PropertyName = "company_employee_setting_adyen_card_transaction")]
@@ -101,11 +121,31 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
+            if (this.UserSubStatus != null)
+            {
+                return false;
+            }
+    
+            if (this.UserVerificationStatus != null)
+            {
+                return false;
+            }
+    
             if (this.CounterUserStatus != null)
             {
                 return false;
             }
     
+            if (this.CounterUserSubStatus != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterUserVerificationStatus != null)
+            {
+                return false;
+            }
+    
             if (this.CompanyEmployeeSettingAdyenCardTransaction != null)
             {
                 return false;
diff --git a/BunqSdk/Model/Generated/Endpoint/RequestInquiryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RequestInquiryApiObject.cs
index f38d794..76ac523 100644
--- a/BunqSdk/Model/Generated/Endpoint/RequestInquiryApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RequestInquiryApiObject.cs
@@ -84,7 +84,7 @@ public class RequestInquiryApiObject : BunqModel
         /// The minimum age the user accepting the RequestInquiry must have.
         /// </summary>
         [JsonProperty(PropertyName = "minimum_age")]
-        public int? MinimumAge { get; set; }
+        public long? MinimumAge { get; set; }
         /// <summary>
         /// Whether or not an address must be provided on accept.
         /// </summary>
@@ -122,12 +122,12 @@ public class RequestInquiryApiObject : BunqModel
         /// The ID of the associated event if the request was made using 'split the bill'.
         /// </summary>
         [JsonProperty(PropertyName = "event_id")]
-        public int? EventId { get; set; }
+        public long? EventId { get; set; }
         /// <summary>
         /// The id of the created RequestInquiry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the payment request's creation.
         /// </summary>
@@ -152,7 +152,7 @@ public class RequestInquiryApiObject : BunqModel
         /// The id of the monetary account the request response applies to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The responded amount.
         /// </summary>
@@ -172,12 +172,12 @@ public class RequestInquiryApiObject : BunqModel
         /// The id of the batch if the request was part of a batch.
         /// </summary>
         [JsonProperty(PropertyName = "batch_id")]
-        public int? BatchId { get; set; }
+        public long? BatchId { get; set; }
         /// <summary>
         /// The id of the scheduled job if the request was scheduled.
         /// </summary>
         [JsonProperty(PropertyName = "scheduled_id")]
-        public int? ScheduledId { get; set; }
+        public long? ScheduledId { get; set; }
         /// <summary>
         /// The url that points to the bunq.me request.
         /// </summary>
@@ -222,7 +222,7 @@ public class RequestInquiryApiObject : BunqModel
         /// <param name="allowAmountHigher">[DEPRECATED] Whether or not the accepting user can choose to accept with a higher amount than requested. Defaults to false.</param>
         /// <param name="redirectUrl">The URL which the user is sent to after accepting or rejecting the Request.</param>
         /// <param name="eventId">The ID of the associated event if the request was made using 'split the bill'.</param>
-        public static BunqResponse<int> Create(AmountObject amountInquired, PointerObject counterpartyAlias, string description, bool? allowBunqme, int? monetaryAccountId= null, List<BunqIdObject> attachment = null, string merchantReference = null, string status = null, int? minimumAge = null, string requireAddress = null, bool? wantTip = null, bool? allowAmountLower = null, bool? allowAmountHigher = null, string redirectUrl = null, int? eventId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(AmountObject amountInquired, PointerObject counterpartyAlias, string description, bool? allowBunqme, long? monetaryAccountId= null, List<BunqIdObject> attachment = null, string merchantReference = null, string status = null, long? minimumAge = null, string requireAddress = null, bool? wantTip = null, bool? allowAmountLower = null, bool? allowAmountHigher = null, string redirectUrl = null, long? eventId = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -256,7 +256,7 @@ public static BunqResponse<int> Create(AmountObject amountInquired, PointerObjec
         /// Revoke a request for payment, by updating the status to REVOKED.
         /// </summary>
         /// <param name="status">The status of the RequestInquiry. Ignored in POST requests but can be used for revoking (cancelling) the RequestInquiry by setting REVOKED with a PUT request.</param>
-        public static BunqResponse<RequestInquiryApiObject> Update(int requestInquiryId, int? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestInquiryApiObject> Update(long requestInquiryId, long? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -277,7 +277,7 @@ public static BunqResponse<RequestInquiryApiObject> Update(int requestInquiryId,
         /// Get all payment requests for a user's monetary account. bunqme_share_url is always null if the counterparty
         /// is a bunq user.
         /// </summary>
-        public static BunqResponse<List<RequestInquiryApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RequestInquiryApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -292,7 +292,7 @@ public static BunqResponse<List<RequestInquiryApiObject>> List(int? monetaryAcco
         /// Get the details of a specific payment request, including its status. bunqme_share_url is always null if the
         /// counterparty is a bunq user.
         /// </summary>
-        public static BunqResponse<RequestInquiryApiObject> Get(int requestInquiryId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestInquiryApiObject> Get(long requestInquiryId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/RequestInquiryBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RequestInquiryBatchApiObject.cs
index 6a36b00..394149a 100644
--- a/BunqSdk/Model/Generated/Endpoint/RequestInquiryBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RequestInquiryBatchApiObject.cs
@@ -55,7 +55,7 @@ public class RequestInquiryBatchApiObject : BunqModel
         /// The ID of the associated event if the request batch was made using 'split the bill'.
         /// </summary>
         [JsonProperty(PropertyName = "event_id")]
-        public int? EventId { get; set; }
+        public long? EventId { get; set; }
         /// <summary>
         /// The reference to the object used for split the bill. Can be Payment, PaymentBatch, ScheduleInstance,
         /// RequestResponse and MasterCardAction
@@ -70,7 +70,7 @@ public class RequestInquiryBatchApiObject : BunqModel
         /// <param name="totalAmountInquired">The total amount originally inquired for this batch.</param>
         /// <param name="status">The status of the request.</param>
         /// <param name="eventId">The ID of the associated event if the request batch was made using 'split the bill'.</param>
-        public static BunqResponse<int> Create(List<RequestInquiryApiObject> requestInquiries, AmountObject totalAmountInquired, int? monetaryAccountId= null, string status = null, int? eventId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(List<RequestInquiryApiObject> requestInquiries, AmountObject totalAmountInquired, long? monetaryAccountId= null, string status = null, long? eventId = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -94,7 +94,7 @@ public static BunqResponse<int> Create(List<RequestInquiryApiObject> requestInqu
         /// Revoke a request batch. The status of all the requests will be set to REVOKED.
         /// </summary>
         /// <param name="status">The status of the request.</param>
-        public static BunqResponse<int> Update(int requestInquiryBatchId, int? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long requestInquiryBatchId, long? monetaryAccountId= null, string status = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -114,7 +114,7 @@ public static BunqResponse<int> Update(int requestInquiryBatchId, int? monetaryA
         /// <summary>
         /// Return the details of a specific request batch.
         /// </summary>
-        public static BunqResponse<RequestInquiryBatchApiObject> Get(int requestInquiryBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestInquiryBatchApiObject> Get(long requestInquiryBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -127,7 +127,7 @@ public static BunqResponse<RequestInquiryBatchApiObject> Get(int requestInquiryB
         /// <summary>
         /// Return all the request batches for a monetary account.
         /// </summary>
-        public static BunqResponse<List<RequestInquiryBatchApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RequestInquiryBatchApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/RequestResponseApiObject.cs b/BunqSdk/Model/Generated/Endpoint/RequestResponseApiObject.cs
index ca0b61b..58b7cd5 100644
--- a/BunqSdk/Model/Generated/Endpoint/RequestResponseApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RequestResponseApiObject.cs
@@ -66,12 +66,12 @@ public class RequestResponseApiObject : BunqModel
         /// convert.
         /// </summary>
         [JsonProperty(PropertyName = "currency_conversion_quote_id")]
-        public int? CurrencyConversionQuoteId { get; set; }
+        public long? CurrencyConversionQuoteId { get; set; }
         /// <summary>
         /// The id of the Request Response.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp when the Request Response was created.
         /// </summary>
@@ -111,7 +111,7 @@ public class RequestResponseApiObject : BunqModel
         /// The id of the MonetaryAccount the RequestResponse was received on.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The requested Amount.
         /// </summary>
@@ -143,7 +143,7 @@ public class RequestResponseApiObject : BunqModel
         /// The minimum age the user accepting the RequestResponse must have.
         /// </summary>
         [JsonProperty(PropertyName = "minimum_age")]
-        public int? MinimumAge { get; set; }
+        public long? MinimumAge { get; set; }
         /// <summary>
         /// Whether or not an address must be provided on accept.
         /// </summary>
@@ -189,7 +189,7 @@ public class RequestResponseApiObject : BunqModel
         /// The whitelist id for this action or null.
         /// </summary>
         [JsonProperty(PropertyName = "eligible_whitelist_id")]
-        public int? EligibleWhitelistId { get; set; }
+        public long? EligibleWhitelistId { get; set; }
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
@@ -199,12 +199,12 @@ public class RequestResponseApiObject : BunqModel
         /// The ID of the latest event for the request.
         /// </summary>
         [JsonProperty(PropertyName = "event_id")]
-        public int? EventId { get; set; }
+        public long? EventId { get; set; }
         /// <summary>
         /// The ID of the monetary account this user prefers to pay the request from.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_preferred_id")]
-        public int? MonetaryAccountPreferredId { get; set; }
+        public long? MonetaryAccountPreferredId { get; set; }
     
         /// <summary>
         /// Update the status to accept or reject the RequestResponse.
@@ -214,7 +214,7 @@ public class RequestResponseApiObject : BunqModel
         /// <param name="addressShipping">The shipping Address to return to the user who created the RequestInquiry. Should only be provided if 'require_address' is set to SHIPPING, BILLING_SHIPPING or OPTIONAL.</param>
         /// <param name="addressBilling">The billing Address to return to the user who created the RequestInquiry. Should only be provided if 'require_address' is set to BILLING, BILLING_SHIPPING or OPTIONAL.</param>
         /// <param name="currencyConversionQuoteId">When the request is accepted on a monetary account with a different currency, a quote is expected to convert.</param>
-        public static BunqResponse<RequestResponseApiObject> Update(int requestResponseId, int? monetaryAccountId= null, AmountObject amountResponded = null, string status = null, AddressObject addressShipping = null, AddressObject addressBilling = null, int? currencyConversionQuoteId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestResponseApiObject> Update(long requestResponseId, long? monetaryAccountId= null, AmountObject amountResponded = null, string status = null, AddressObject addressShipping = null, AddressObject addressBilling = null, long? currencyConversionQuoteId = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -238,7 +238,7 @@ public static BunqResponse<RequestResponseApiObject> Update(int requestResponseI
         /// <summary>
         /// Get all RequestResponses for a MonetaryAccount.
         /// </summary>
-        public static BunqResponse<List<RequestResponseApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RequestResponseApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -252,7 +252,7 @@ public static BunqResponse<List<RequestResponseApiObject>> List(int? monetaryAcc
         /// <summary>
         /// Get the details for a specific existing RequestResponse.
         /// </summary>
-        public static BunqResponse<RequestResponseApiObject> Get(int requestResponseId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestResponseApiObject> Get(long requestResponseId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/SandboxUserCompanyApiObject.cs b/BunqSdk/Model/Generated/Endpoint/SandboxUserCompanyApiObject.cs
index 72fe652..1db4c78 100644
--- a/BunqSdk/Model/Generated/Endpoint/SandboxUserCompanyApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SandboxUserCompanyApiObject.cs
@@ -30,10 +30,15 @@ public class SandboxUserCompanyApiObject : BunqModel
         [JsonProperty(PropertyName = "api_key")]
         public string ApiKey { get; set; }
         /// <summary>
-        /// The user which was created.
+        /// The user company which was created.
         /// </summary>
-        [JsonProperty(PropertyName = "user")]
-        public UserApiObject User { get; set; }
+        [JsonProperty(PropertyName = "user_company")]
+        public UserCompanyApiObject UserCompany { get; set; }
+        /// <summary>
+        /// The director of the company which was created.
+        /// </summary>
+        [JsonProperty(PropertyName = "user_person")]
+        public UserPersonApiObject UserPerson { get; set; }
         /// <summary>
         /// The login code which the developer can use to log into their sandbox user.
         /// </summary>
@@ -68,7 +73,12 @@ public override bool IsAllFieldNull()
                 return false;
             }
     
-            if (this.User != null)
+            if (this.UserCompany != null)
+            {
+                return false;
+            }
+    
+            if (this.UserPerson != null)
             {
                 return false;
             }
diff --git a/BunqSdk/Model/Generated/Endpoint/ScheduleApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ScheduleApiObject.cs
index 936c912..28d338f 100644
--- a/BunqSdk/Model/Generated/Endpoint/ScheduleApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ScheduleApiObject.cs
@@ -53,7 +53,7 @@ public class ScheduleApiObject : BunqModel
         /// The schedule recurrence size. For example size 4 and unit WEEKLY means the recurrence is every 4 weeks.
         /// </summary>
         [JsonProperty(PropertyName = "recurrence_size")]
-        public int? RecurrenceSize { get; set; }
+        public long? RecurrenceSize { get; set; }
         /// <summary>
         /// The schedule status, options: ACTIVE, FINISHED, CANCELLED.
         /// </summary>
@@ -68,7 +68,7 @@ public class ScheduleApiObject : BunqModel
         /// <summary>
         /// Get a specific schedule definition for a given monetary account.
         /// </summary>
-        public static BunqResponse<ScheduleApiObject> Get(int scheduleId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ScheduleApiObject> Get(long scheduleId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<ScheduleApiObject> Get(int scheduleId, int? monetaryA
         /// filter the response. When type={SCHEDULE_DEFINITION_PAYMENT,SCHEDULE_DEFINITION_PAYMENT_BATCH} is provided
         /// only schedule definition object that relate to these definitions are returned.
         /// </summary>
-        public static BunqResponse<List<ScheduleApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ScheduleApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/ScheduleInstanceApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ScheduleInstanceApiObject.cs
index af0045d..2a759e2 100644
--- a/BunqSdk/Model/Generated/Endpoint/ScheduleInstanceApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ScheduleInstanceApiObject.cs
@@ -70,7 +70,7 @@ public class ScheduleInstanceApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<ScheduleInstanceApiObject> Get(int scheduleId, int scheduleInstanceId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ScheduleInstanceApiObject> Get(long scheduleId, long scheduleInstanceId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<ScheduleInstanceApiObject> Get(int scheduleId, int sc
         /// <summary>
         /// </summary>
         /// <param name="state">Change the state of the scheduleInstance from FAILED_USER_ERROR to RETRY.</param>
-        public static BunqResponse<int> Update(int scheduleId, int scheduleInstanceId, int? monetaryAccountId= null, string state = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long scheduleId, long scheduleInstanceId, long? monetaryAccountId= null, string state = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -102,7 +102,7 @@ public static BunqResponse<int> Update(int scheduleId, int scheduleInstanceId, i
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<ScheduleInstanceApiObject>> List(int scheduleId, int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ScheduleInstanceApiObject>> List(long scheduleId, long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/SchedulePaymentApiObject.cs b/BunqSdk/Model/Generated/Endpoint/SchedulePaymentApiObject.cs
index a942c53..571f4ea 100644
--- a/BunqSdk/Model/Generated/Endpoint/SchedulePaymentApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SchedulePaymentApiObject.cs
@@ -63,7 +63,7 @@ public class SchedulePaymentApiObject : BunqModel
         /// <param name="payment">The payment details.</param>
         /// <param name="schedule">The schedule details when creating or updating a scheduled payment.</param>
         /// <param name="purpose">The purpose of this scheduled payment.</param>
-        public static BunqResponse<int> Create(SchedulePaymentEntryObject payment, ScheduleApiObject schedule, int? monetaryAccountId= null, string purpose = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(SchedulePaymentEntryObject payment, ScheduleApiObject schedule, long? monetaryAccountId= null, string purpose = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -84,7 +84,7 @@ public static BunqResponse<int> Create(SchedulePaymentEntryObject payment, Sched
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long schedulePaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -96,7 +96,7 @@ public static BunqResponse<object> Delete(int schedulePaymentId, int? monetaryAc
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<SchedulePaymentApiObject> Get(int schedulePaymentId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SchedulePaymentApiObject> Get(long schedulePaymentId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -108,7 +108,7 @@ public static BunqResponse<SchedulePaymentApiObject> Get(int schedulePaymentId,
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<SchedulePaymentApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<SchedulePaymentApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -123,7 +123,7 @@ public static BunqResponse<List<SchedulePaymentApiObject>> List(int? monetaryAcc
         /// </summary>
         /// <param name="payment">The payment details.</param>
         /// <param name="schedule">The schedule details when creating or updating a scheduled payment.</param>
-        public static BunqResponse<SchedulePaymentApiObject> Update(int schedulePaymentId, int? monetaryAccountId= null, SchedulePaymentEntryObject payment = null, ScheduleApiObject schedule = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SchedulePaymentApiObject> Update(long schedulePaymentId, long? monetaryAccountId= null, SchedulePaymentEntryObject payment = null, ScheduleApiObject schedule = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/SchedulePaymentBatchApiObject.cs b/BunqSdk/Model/Generated/Endpoint/SchedulePaymentBatchApiObject.cs
index e41663a..eb67ecb 100644
--- a/BunqSdk/Model/Generated/Endpoint/SchedulePaymentBatchApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SchedulePaymentBatchApiObject.cs
@@ -47,7 +47,7 @@ public class SchedulePaymentBatchApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<SchedulePaymentBatchApiObject> Get(int schedulePaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SchedulePaymentBatchApiObject> Get(long schedulePaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -61,7 +61,7 @@ public static BunqResponse<SchedulePaymentBatchApiObject> Get(int schedulePaymen
         /// </summary>
         /// <param name="payments">The payment details.</param>
         /// <param name="schedule">The schedule details when creating a scheduled payment.</param>
-        public static BunqResponse<int> Create(List<SchedulePaymentEntryObject> payments, ScheduleApiObject schedule, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(List<SchedulePaymentEntryObject> payments, ScheduleApiObject schedule, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -83,7 +83,7 @@ public static BunqResponse<int> Create(List<SchedulePaymentEntryObject> payments
         /// </summary>
         /// <param name="payments">The payment details.</param>
         /// <param name="schedule">The schedule details when creating a scheduled payment.</param>
-        public static BunqResponse<int> Update(int schedulePaymentBatchId, int? monetaryAccountId= null, List<SchedulePaymentEntryObject> payments = null, ScheduleApiObject schedule = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long schedulePaymentBatchId, long? monetaryAccountId= null, List<SchedulePaymentEntryObject> payments = null, ScheduleApiObject schedule = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -103,7 +103,7 @@ public static BunqResponse<int> Update(int schedulePaymentBatchId, int? monetary
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long schedulePaymentBatchId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ServerErrorApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ServerErrorApiObject.cs
index d1ceb65..4ab1319 100644
--- a/BunqSdk/Model/Generated/Endpoint/ServerErrorApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ServerErrorApiObject.cs
@@ -22,7 +22,7 @@ public class ServerErrorApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<int> Create( IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create( IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/SessionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/SessionApiObject.cs
index f1c1eb4..ddba57f 100644
--- a/BunqSdk/Model/Generated/Endpoint/SessionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SessionApiObject.cs
@@ -23,7 +23,7 @@ public class SessionApiObject : BunqModel
         /// <summary>
         /// Deletes the current session.
         /// </summary>
-        public static BunqResponse<object> Delete(int sessionId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long sessionId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountInquiryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountInquiryApiObject.cs
index f7d1c46..a9c862a 100644
--- a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountInquiryApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountInquiryApiObject.cs
@@ -57,7 +57,7 @@ public class ShareInviteMonetaryAccountInquiryApiObject : BunqModel
         /// DEPRECATED: USE `access_type` INSTEAD | The id of the draft share invite bank.
         /// </summary>
         [JsonProperty(PropertyName = "draft_share_invite_bank_id")]
-        public int? DraftShareInviteBankId { get; set; }
+        public long? DraftShareInviteBankId { get; set; }
         /// <summary>
         /// DEPRECATED: USE `access_type` INSTEAD | The share details. Only one of these objects may be passed.
         /// </summary>
@@ -107,12 +107,12 @@ public class ShareInviteMonetaryAccountInquiryApiObject : BunqModel
         /// The id of the monetary account the share applies to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The id of the newly created share invite.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
         /// <summary>
         /// [DEPRECATED - use /share-invite-monetary-account-response] Create a new share inquiry for a monetary
@@ -127,7 +127,7 @@ public class ShareInviteMonetaryAccountInquiryApiObject : BunqModel
         /// <param name="shareType">DEPRECATED: USE `access_type` INSTEAD | The share type, either STANDARD or MUTUAL.</param>
         /// <param name="startDate">DEPRECATED: USE `access_type` INSTEAD | The start date of this share.</param>
         /// <param name="endDate">DEPRECATED: USE `access_type` INSTEAD | The expiration date of this share.</param>
-        public static BunqResponse<int> Create(PointerObject counterUserAlias, int? monetaryAccountId= null, string accessType = null, int? draftShareInviteBankId = null, ShareDetailObject shareDetail = null, string status = null, string relationship = null, string shareType = null, string startDate = null, string endDate = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(PointerObject counterUserAlias, long? monetaryAccountId= null, string accessType = null, long? draftShareInviteBankId = null, ShareDetailObject shareDetail = null, string status = null, string relationship = null, string shareType = null, string startDate = null, string endDate = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -155,7 +155,7 @@ public static BunqResponse<int> Create(PointerObject counterUserAlias, int? mone
         /// <summary>
         /// [DEPRECATED - use /share-invite-monetary-account-response] Get the details of a specific share inquiry.
         /// </summary>
-        public static BunqResponse<ShareInviteMonetaryAccountInquiryApiObject> Get(int shareInviteMonetaryAccountInquiryId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ShareInviteMonetaryAccountInquiryApiObject> Get(long shareInviteMonetaryAccountInquiryId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -174,7 +174,7 @@ public static BunqResponse<ShareInviteMonetaryAccountInquiryApiObject> Get(int s
         /// <param name="status">The status of the share. Can be ACTIVE, REVOKED, REJECTED.</param>
         /// <param name="startDate">DEPRECATED: USE `access_type` INSTEAD | The start date of this share.</param>
         /// <param name="endDate">DEPRECATED: USE `access_type` INSTEAD | The expiration date of this share.</param>
-        public static BunqResponse<int> Update(int shareInviteMonetaryAccountInquiryId, int? monetaryAccountId= null, string accessType = null, ShareDetailObject shareDetail = null, string status = null, string startDate = null, string endDate = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long shareInviteMonetaryAccountInquiryId, long? monetaryAccountId= null, string accessType = null, ShareDetailObject shareDetail = null, string status = null, string startDate = null, string endDate = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -199,7 +199,7 @@ public static BunqResponse<int> Update(int shareInviteMonetaryAccountInquiryId,
         /// [DEPRECATED - use /share-invite-monetary-account-response] Get a list with all the share inquiries for a
         /// monetary account, only if the requesting user has permission to change the details of the various ones.
         /// </summary>
-        public static BunqResponse<List<ShareInviteMonetaryAccountInquiryApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ShareInviteMonetaryAccountInquiryApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountResponseApiObject.cs b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountResponseApiObject.cs
index d14aa83..aea8989 100644
--- a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountResponseApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountResponseApiObject.cs
@@ -43,12 +43,12 @@ public class ShareInviteMonetaryAccountResponseApiObject : BunqModel
         /// The card to link to the shared monetary account. Used only if share_detail is ShareDetailCardPayment.
         /// </summary>
         [JsonProperty(PropertyName = "card_id")]
-        public int? CardId { get; set; }
+        public long? CardId { get; set; }
         /// <summary>
         /// The id of the ShareInviteBankResponse.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the ShareInviteBankResponse creation.
         /// </summary>
@@ -73,12 +73,12 @@ public class ShareInviteMonetaryAccountResponseApiObject : BunqModel
         /// The id of the monetary account the ACCEPTED share applies to. null otherwise.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The id of the draft share invite bank.
         /// </summary>
         [JsonProperty(PropertyName = "draft_share_invite_bank_id")]
-        public int? DraftShareInviteBankId { get; set; }
+        public long? DraftShareInviteBankId { get; set; }
         /// <summary>
         /// The share details.
         /// </summary>
@@ -118,7 +118,7 @@ public class ShareInviteMonetaryAccountResponseApiObject : BunqModel
         /// <summary>
         /// Return the details of a specific share a user was invited to.
         /// </summary>
-        public static BunqResponse<ShareInviteMonetaryAccountResponseApiObject> Get(int shareInviteMonetaryAccountResponseId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ShareInviteMonetaryAccountResponseApiObject> Get(long shareInviteMonetaryAccountResponseId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -133,7 +133,7 @@ public static BunqResponse<ShareInviteMonetaryAccountResponseApiObject> Get(int
         /// </summary>
         /// <param name="status">The status of the share. Can be PENDING, REVOKED (the user deletes the share inquiry before it's accepted), ACCEPTED, CANCELLED (the user deletes an active share) or CANCELLATION_PENDING, CANCELLATION_ACCEPTED, CANCELLATION_REJECTED (for canceling mutual connects)</param>
         /// <param name="cardId">The card to link to the shared monetary account. Used only if share_detail is ShareDetailCardPayment.</param>
-        public static BunqResponse<int> Update(int shareInviteMonetaryAccountResponseId, string status = null, int? cardId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long shareInviteMonetaryAccountResponseId, string status = null, long? cardId = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/SofortMerchantTransactionApiObject.cs b/BunqSdk/Model/Generated/Endpoint/SofortMerchantTransactionApiObject.cs
index 8a06131..7d2db32 100644
--- a/BunqSdk/Model/Generated/Endpoint/SofortMerchantTransactionApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SofortMerchantTransactionApiObject.cs
@@ -46,7 +46,7 @@ public class SofortMerchantTransactionApiObject : BunqModel
         /// The id of the monetary account this sofort merchant transaction links to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The alias of the monetary account to add money to.
         /// </summary>
@@ -85,7 +85,7 @@ public class SofortMerchantTransactionApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<SofortMerchantTransactionApiObject> Get(int sofortMerchantTransactionId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SofortMerchantTransactionApiObject> Get(long sofortMerchantTransactionId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -97,7 +97,7 @@ public static BunqResponse<SofortMerchantTransactionApiObject> Get(int sofortMer
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<SofortMerchantTransactionApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<SofortMerchantTransactionApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/TokenQrRequestIdealApiObject.cs b/BunqSdk/Model/Generated/Endpoint/TokenQrRequestIdealApiObject.cs
index 4ee4a36..ae8add4 100644
--- a/BunqSdk/Model/Generated/Endpoint/TokenQrRequestIdealApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TokenQrRequestIdealApiObject.cs
@@ -42,7 +42,7 @@ public class TokenQrRequestIdealApiObject : BunqModel
         /// The id of the RequestResponse.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of when the RequestResponse was responded to.
         /// </summary>
@@ -57,7 +57,7 @@ public class TokenQrRequestIdealApiObject : BunqModel
         /// The id of the MonetaryAccount the RequestResponse was received on.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The requested Amount.
         /// </summary>
@@ -99,7 +99,7 @@ public class TokenQrRequestIdealApiObject : BunqModel
         /// The minimum age the user accepting the RequestResponse must have.
         /// </summary>
         [JsonProperty(PropertyName = "minimum_age")]
-        public int? MinimumAge { get; set; }
+        public long? MinimumAge { get; set; }
         /// <summary>
         /// Whether or not an address must be provided on accept.
         /// </summary>
@@ -139,7 +139,7 @@ public class TokenQrRequestIdealApiObject : BunqModel
         /// The whitelist id for this action or null.
         /// </summary>
         [JsonProperty(PropertyName = "eligible_whitelist_id")]
-        public int? EligibleWhitelistId { get; set; }
+        public long? EligibleWhitelistId { get; set; }
     
         /// <summary>
         /// Create a request from an ideal transaction.
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountQuoteApiObject.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountQuoteApiObject.cs
index 2454551..8e36227 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountQuoteApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountQuoteApiObject.cs
@@ -84,7 +84,7 @@ public class TransferwiseAccountQuoteApiObject : BunqModel
         /// <param name="type">The chosen recipient account type. The possible options are provided dynamically in the response endpoint.</param>
         /// <param name="country">The country of the receiving account.</param>
         /// <param name="detail">The fields which were specified as "required" and have since been filled by the user. Always provide the full list.</param>
-        public static BunqResponse<int> Create(int transferwiseQuoteId, string nameAccountHolder, string type, string country = null, List<TransferwiseRequirementFieldObject> detail = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long transferwiseQuoteId, string nameAccountHolder, string type, string country = null, List<TransferwiseRequirementFieldObject> detail = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -106,7 +106,7 @@ public static BunqResponse<int> Create(int transferwiseQuoteId, string nameAccou
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<TransferwiseAccountQuoteApiObject> Get(int transferwiseQuoteId, int transferwiseAccountQuoteId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TransferwiseAccountQuoteApiObject> Get(long transferwiseQuoteId, long transferwiseAccountQuoteId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -118,7 +118,7 @@ public static BunqResponse<TransferwiseAccountQuoteApiObject> Get(int transferwi
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TransferwiseAccountQuoteApiObject>> List(int transferwiseQuoteId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TransferwiseAccountQuoteApiObject>> List(long transferwiseQuoteId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
@@ -131,7 +131,7 @@ public static BunqResponse<List<TransferwiseAccountQuoteApiObject>> List(int tra
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int transferwiseQuoteId, int transferwiseAccountQuoteId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long transferwiseQuoteId, long transferwiseAccountQuoteId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountRequirementApiObject.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountRequirementApiObject.cs
index 538adfd..7c08565 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountRequirementApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountRequirementApiObject.cs
@@ -72,7 +72,7 @@ public class TransferwiseAccountRequirementApiObject : BunqModel
         /// <param name="type">The chosen recipient account type. The possible options are provided dynamically in the response endpoint.</param>
         /// <param name="country">The country of the receiving account.</param>
         /// <param name="detail">The fields which were specified as "required" and have since been filled by the user. Always provide the full list.</param>
-        public static BunqResponse<int> Create(int transferwiseQuoteId, string nameAccountHolder, string type, string country = null, List<TransferwiseRequirementFieldObject> detail = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long transferwiseQuoteId, string nameAccountHolder, string type, string country = null, List<TransferwiseRequirementFieldObject> detail = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -94,7 +94,7 @@ public static BunqResponse<int> Create(int transferwiseQuoteId, string nameAccou
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TransferwiseAccountRequirementApiObject>> List(int transferwiseQuoteId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TransferwiseAccountRequirementApiObject>> List(long transferwiseQuoteId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteApiObject.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteApiObject.cs
index bd6e164..d7d629d 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteApiObject.cs
@@ -58,7 +58,7 @@ public class TransferwiseQuoteApiObject : BunqModel
         /// The id of the quote.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the quote's creation.
         /// </summary>
@@ -101,7 +101,7 @@ public class TransferwiseQuoteApiObject : BunqModel
         /// <param name="currencyTarget">The target currency.</param>
         /// <param name="amountSource">The source amount. Required if target amount is left empty.</param>
         /// <param name="amountTarget">The target amount. Required if source amount is left empty.</param>
-        public static BunqResponse<int> Create(string currencySource, string currencyTarget, AmountObject amountSource = null, AmountObject amountTarget = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string currencySource, string currencyTarget, AmountObject amountSource = null, AmountObject amountTarget = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -123,7 +123,7 @@ public static BunqResponse<int> Create(string currencySource, string currencyTar
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<TransferwiseQuoteApiObject> Get(int transferwiseQuoteId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TransferwiseQuoteApiObject> Get(long transferwiseQuoteId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteTemporaryApiObject.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteTemporaryApiObject.cs
index 79f0472..d27cc68 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteTemporaryApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteTemporaryApiObject.cs
@@ -58,7 +58,7 @@ public class TransferwiseQuoteTemporaryApiObject : BunqModel
         /// The id of the quote.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the note's creation.
         /// </summary>
@@ -91,7 +91,7 @@ public class TransferwiseQuoteTemporaryApiObject : BunqModel
         /// <param name="currencyTarget">The target currency.</param>
         /// <param name="amountSource">The source amount. Required if target amount is left empty.</param>
         /// <param name="amountTarget">The target amount. Required if source amount is left empty.</param>
-        public static BunqResponse<int> Create(string currencySource, string currencyTarget, AmountObject amountSource = null, AmountObject amountTarget = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string currencySource, string currencyTarget, AmountObject amountSource = null, AmountObject amountTarget = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -113,7 +113,7 @@ public static BunqResponse<int> Create(string currencySource, string currencyTar
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<TransferwiseQuoteTemporaryApiObject> Get(int transferwiseQuoteTemporaryId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TransferwiseQuoteTemporaryApiObject> Get(long transferwiseQuoteTemporaryId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferApiObject.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferApiObject.cs
index e2ab0ec..0a9a8a8 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferApiObject.cs
@@ -113,7 +113,7 @@ public class TransferwiseTransferApiObject : BunqModel
         /// </summary>
         /// <param name="monetaryAccountId">The id of the monetary account the payment should be made from.</param>
         /// <param name="recipientId">The id of the target account.</param>
-        public static BunqResponse<int> Create(int transferwiseQuoteId, string monetaryAccountId, string recipientId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long transferwiseQuoteId, string monetaryAccountId, string recipientId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -133,7 +133,7 @@ public static BunqResponse<int> Create(int transferwiseQuoteId, string monetaryA
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<TransferwiseTransferApiObject> Get(int transferwiseQuoteId, int transferwiseTransferId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TransferwiseTransferApiObject> Get(long transferwiseQuoteId, long transferwiseTransferId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -145,7 +145,7 @@ public static BunqResponse<TransferwiseTransferApiObject> Get(int transferwiseQu
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TransferwiseTransferApiObject>> List(int transferwiseQuoteId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TransferwiseTransferApiObject>> List(long transferwiseQuoteId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferRequirementApiObject.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferRequirementApiObject.cs
index 81a1089..08647da 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferRequirementApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferRequirementApiObject.cs
@@ -58,7 +58,7 @@ public class TransferwiseTransferRequirementApiObject : BunqModel
         /// </summary>
         /// <param name="recipientId">The id of the target account.</param>
         /// <param name="detail">The fields which were specified as "required" and have since been filled by the user. Always provide the full list.</param>
-        public static BunqResponse<int> Create(int transferwiseQuoteId, string recipientId, List<TransferwiseRequirementFieldObject> detail = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long transferwiseQuoteId, string recipientId, List<TransferwiseRequirementFieldObject> detail = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseUserApiObject.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseUserApiObject.cs
index 933bcfd..eab909e 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseUserApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseUserApiObject.cs
@@ -40,7 +40,7 @@ public class TransferwiseUserApiObject : BunqModel
         /// The id of the TransferwiseUser.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the TransferwiseUser's creation.
         /// </summary>
@@ -70,7 +70,7 @@ public class TransferwiseUserApiObject : BunqModel
         /// <summary>
         /// </summary>
         /// <param name="oauthCode">The OAuth code returned by Transferwise we should be using to gain access to the user's Transferwise account.</param>
-        public static BunqResponse<int> Create(string oauthCode = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(string oauthCode = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/UserApiKeyApiObject.cs b/BunqSdk/Model/Generated/Endpoint/UserApiKeyApiObject.cs
index e4bf470..6ed7469 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserApiKeyApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserApiKeyApiObject.cs
@@ -14,7 +14,7 @@ public class UserApiKeyApiObject : BunqModel
         /// The id of the user.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the user object's creation.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/UserBlocklistMasterCardMerchantApiObject.cs b/BunqSdk/Model/Generated/Endpoint/UserBlocklistMasterCardMerchantApiObject.cs
index b88c3c3..9ecb30c 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserBlocklistMasterCardMerchantApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserBlocklistMasterCardMerchantApiObject.cs
@@ -48,7 +48,7 @@ public class UserBlocklistMasterCardMerchantApiObject : BunqModel
         /// The id of the blocklist.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the object's creation.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/UserCompanyApiObject.cs b/BunqSdk/Model/Generated/Endpoint/UserCompanyApiObject.cs
index 4da42d1..4cb3e31 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserCompanyApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserCompanyApiObject.cs
@@ -119,7 +119,7 @@ public class UserCompanyApiObject : BunqModel
         /// The setting for the session timeout of the company in seconds.
         /// </summary>
         [JsonProperty(PropertyName = "session_timeout")]
-        public int? SessionTimeout { get; set; }
+        public long? SessionTimeout { get; set; }
         /// <summary>
         /// The amount the company can pay in the session without asking for credentials.
         /// </summary>
@@ -129,7 +129,7 @@ public class UserCompanyApiObject : BunqModel
         /// The id of the modified company.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the company object's creation.
         /// </summary>
@@ -257,7 +257,7 @@ public static BunqResponse<UserCompanyApiObject> Get( IDictionary<string, string
         /// <param name="subStatus">The user sub-status. Can be: NONE, FACE_RESET, APPROVAL, APPROVAL_DIRECTOR, APPROVAL_PARENT, APPROVAL_SUPPORT, COUNTER_IBAN, IDEAL or SUBMIT.</param>
         /// <param name="sessionTimeout">The setting for the session timeout of the company in seconds.</param>
         /// <param name="dailyLimitWithoutConfirmationLogin">The amount the company can pay in the session without asking for credentials.</param>
-        public static BunqResponse<int> Update(string name = null, string publicNickName = null, string avatarUuid = null, AddressObject addressMain = null, AddressObject addressPostal = null, string language = null, string region = null, string country = null, List<UboObject> ubo = null, string chamberOfCommerceNumber = null, string legalForm = null, string status = null, string subStatus = null, int? sessionTimeout = null, AmountObject dailyLimitWithoutConfirmationLogin = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(string name = null, string publicNickName = null, string avatarUuid = null, AddressObject addressMain = null, AddressObject addressPostal = null, string language = null, string region = null, string country = null, List<UboObject> ubo = null, string chamberOfCommerceNumber = null, string legalForm = null, string status = null, string subStatus = null, long? sessionTimeout = null, AmountObject dailyLimitWithoutConfirmationLogin = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/UserCompanyNameApiObject.cs b/BunqSdk/Model/Generated/Endpoint/UserCompanyNameApiObject.cs
index 089dc49..374f9d1 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserCompanyNameApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserCompanyNameApiObject.cs
@@ -34,7 +34,7 @@ public class UserCompanyNameApiObject : BunqModel
         /// <summary>
         /// Return all the known (trade) names for a specific user company.
         /// </summary>
-        public static BunqResponse<List<UserCompanyNameApiObject>> List(int userCompanyId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<UserCompanyNameApiObject>> List(long userCompanyId, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/UserCredentialPasswordIpApiObject.cs b/BunqSdk/Model/Generated/Endpoint/UserCredentialPasswordIpApiObject.cs
index c18d62a..377450c 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserCredentialPasswordIpApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserCredentialPasswordIpApiObject.cs
@@ -31,7 +31,7 @@ public class UserCredentialPasswordIpApiObject : BunqModel
         /// The id of the credential.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the credential object's creation.
         /// </summary>
@@ -65,7 +65,7 @@ public class UserCredentialPasswordIpApiObject : BunqModel
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<UserCredentialPasswordIpApiObject> Get(int userCredentialPasswordIpId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<UserCredentialPasswordIpApiObject> Get(long userCredentialPasswordIpId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/UserPartnerPromotionCashbackApiObject.cs b/BunqSdk/Model/Generated/Endpoint/UserPartnerPromotionCashbackApiObject.cs
index 6e44393..a3ff419 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserPartnerPromotionCashbackApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserPartnerPromotionCashbackApiObject.cs
@@ -29,7 +29,7 @@ public class UserPartnerPromotionCashbackApiObject : BunqModel
         /// The number of transactions that are still eligible for this promotion.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_transaction_remaining")]
-        public int? NumberOfTransactionRemaining { get; set; }
+        public long? NumberOfTransactionRemaining { get; set; }
         /// <summary>
         /// The promotion that the user signed up with.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/UserPaymentServiceProviderApiObject.cs b/BunqSdk/Model/Generated/Endpoint/UserPaymentServiceProviderApiObject.cs
index 6e99de1..8ee065e 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserPaymentServiceProviderApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserPaymentServiceProviderApiObject.cs
@@ -29,7 +29,7 @@ public class UserPaymentServiceProviderApiObject : BunqModel
         /// The id of the user.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the user object's creation.
         /// </summary>
@@ -96,11 +96,11 @@ public class UserPaymentServiceProviderApiObject : BunqModel
         /// The setting for the session timeout of the user in seconds.
         /// </summary>
         [JsonProperty(PropertyName = "session_timeout")]
-        public int? SessionTimeout { get; set; }
+        public long? SessionTimeout { get; set; }
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<UserPaymentServiceProviderApiObject> Get(int userPaymentServiceProviderId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<UserPaymentServiceProviderApiObject> Get(long userPaymentServiceProviderId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/UserPersonApiObject.cs b/BunqSdk/Model/Generated/Endpoint/UserPersonApiObject.cs
index 1449d92..3e6a1c6 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserPersonApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserPersonApiObject.cs
@@ -123,12 +123,12 @@ public class UserPersonApiObject : BunqModel
         /// The reference to the uploaded picture/scan of the front side of the identification document.
         /// </summary>
         [JsonProperty(PropertyName = "document_front_attachment_id")]
-        public int? DocumentFrontAttachmentId { get; set; }
+        public long? DocumentFrontAttachmentId { get; set; }
         /// <summary>
         /// The reference to the uploaded picture/scan of the back side of the identification document.
         /// </summary>
         [JsonProperty(PropertyName = "document_back_attachment_id")]
-        public int? DocumentBackAttachmentId { get; set; }
+        public long? DocumentBackAttachmentId { get; set; }
         /// <summary>
         /// The person's date of birth. Accepts ISO8601 date formats.
         /// </summary>
@@ -181,7 +181,7 @@ public class UserPersonApiObject : BunqModel
         /// The setting for the session timeout of the user in seconds.
         /// </summary>
         [JsonProperty(PropertyName = "session_timeout")]
-        public int? SessionTimeout { get; set; }
+        public long? SessionTimeout { get; set; }
         /// <summary>
         /// The amount the user can pay in the session without asking for credentials.
         /// </summary>
@@ -201,7 +201,7 @@ public class UserPersonApiObject : BunqModel
         /// The id of the modified person object.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the person object's creation.
         /// </summary>
@@ -304,7 +304,7 @@ public static BunqResponse<UserPersonApiObject> Get( IDictionary<string, string>
         /// <param name="sessionTimeout">The setting for the session timeout of the user in seconds.</param>
         /// <param name="dailyLimitWithoutConfirmationLogin">The amount the user can pay in the session without asking for credentials.</param>
         /// <param name="displayName">The person's legal name. Available legal names can be listed via the 'user/{user_id}/legal-name' endpoint.</param>
-        public static BunqResponse<int> Update(string firstName = null, string middleName = null, string lastName = null, string publicNickName = null, AddressObject addressMain = null, AddressObject addressPostal = null, string avatarUuid = null, List<TaxResidentObject> taxResident = null, string documentType = null, string documentNumber = null, string documentCountryOfIssuance = null, int? documentFrontAttachmentId = null, int? documentBackAttachmentId = null, string dateOfBirth = null, string nationality = null, List<string> allNationality = null, string language = null, string region = null, string gender = null, string status = null, string subStatus = null, PointerObject legalGuardianAlias = null, int? sessionTimeout = null, AmountObject dailyLimitWithoutConfirmationLogin = null, string displayName = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(string firstName = null, string middleName = null, string lastName = null, string publicNickName = null, AddressObject addressMain = null, AddressObject addressPostal = null, string avatarUuid = null, List<TaxResidentObject> taxResident = null, string documentType = null, string documentNumber = null, string documentCountryOfIssuance = null, long? documentFrontAttachmentId = null, long? documentBackAttachmentId = null, string dateOfBirth = null, string nationality = null, List<string> allNationality = null, string language = null, string region = null, string gender = null, string status = null, string subStatus = null, PointerObject legalGuardianAlias = null, long? sessionTimeout = null, AmountObject dailyLimitWithoutConfirmationLogin = null, string displayName = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistResultApiObject.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistResultApiObject.cs
index d074e78..9118cc0 100644
--- a/BunqSdk/Model/Generated/Endpoint/WhitelistResultApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistResultApiObject.cs
@@ -14,12 +14,12 @@ public class WhitelistResultApiObject : BunqModel
         /// The ID of the whitelist entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The account from which payments will be deducted when a transaction is matched with this whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_paying_id")]
-        public int? MonetaryAccountPayingId { get; set; }
+        public long? MonetaryAccountPayingId { get; set; }
         /// <summary>
         /// The status of the WhitelistResult.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistSddApiObject.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistSddApiObject.cs
index 27df386..b2fa616 100644
--- a/BunqSdk/Model/Generated/Endpoint/WhitelistSddApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistSddApiObject.cs
@@ -37,12 +37,12 @@ public class WhitelistSddApiObject : BunqModel
         /// The account from which payments will be deducted when a transaction is matched with this whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_paying_id")]
-        public int? MonetaryAccountPayingId { get; set; }
+        public long? MonetaryAccountPayingId { get; set; }
         /// <summary>
         /// ID of the request for which you want to whitelist the originating SDD.
         /// </summary>
         [JsonProperty(PropertyName = "request_id")]
-        public int? RequestId { get; set; }
+        public long? RequestId { get; set; }
         /// <summary>
         /// The monthly maximum amount that can be deducted from the target account.
         /// </summary>
@@ -52,12 +52,12 @@ public class WhitelistSddApiObject : BunqModel
         /// The ID of the whitelist entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The account to which payments will come in before possibly being 'redirected' by the whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_incoming_id")]
-        public int? MonetaryAccountIncomingId { get; set; }
+        public long? MonetaryAccountIncomingId { get; set; }
         /// <summary>
         /// The type of the SDD whitelist, can be CORE or B2B.
         /// </summary>
@@ -92,7 +92,7 @@ public class WhitelistSddApiObject : BunqModel
         /// <summary>
         /// Get a specific recurring SDD whitelist entry.
         /// </summary>
-        public static BunqResponse<WhitelistSddApiObject> Get(int whitelistSddId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<WhitelistSddApiObject> Get(long whitelistSddId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistSddMonetaryAccountPayingApiObject.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistSddMonetaryAccountPayingApiObject.cs
index df34128..610e943 100644
--- a/BunqSdk/Model/Generated/Endpoint/WhitelistSddMonetaryAccountPayingApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistSddMonetaryAccountPayingApiObject.cs
@@ -30,17 +30,17 @@ public class WhitelistSddMonetaryAccountPayingApiObject : BunqModel
         /// The ID of the whitelist entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The account to which payments will come in before possibly being 'redirected' by the whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_incoming_id")]
-        public int? MonetaryAccountIncomingId { get; set; }
+        public long? MonetaryAccountIncomingId { get; set; }
         /// <summary>
         /// The account from which payments will be deducted when a transaction is matched with this whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_paying_id")]
-        public int? MonetaryAccountPayingId { get; set; }
+        public long? MonetaryAccountPayingId { get; set; }
         /// <summary>
         /// The type of the SDD whitelist, can be CORE or B2B.
         /// </summary>
@@ -80,7 +80,7 @@ public class WhitelistSddMonetaryAccountPayingApiObject : BunqModel
         /// <summary>
         /// Get a specific SDD whitelist entry.
         /// </summary>
-        public static BunqResponse<WhitelistSddMonetaryAccountPayingApiObject> Get(int whitelistSddMonetaryAccountPayingId, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<WhitelistSddMonetaryAccountPayingApiObject> Get(long whitelistSddMonetaryAccountPayingId, long? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -93,7 +93,7 @@ public static BunqResponse<WhitelistSddMonetaryAccountPayingApiObject> Get(int w
         /// <summary>
         /// Get a listing of all SDD whitelist entries for a target monetary account.
         /// </summary>
-        public static BunqResponse<List<WhitelistSddMonetaryAccountPayingApiObject>> List(int? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<WhitelistSddMonetaryAccountPayingApiObject>> List(long? monetaryAccountId= null, IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
         {
             if (urlParams == null) urlParams = new Dictionary<string, string>();
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistSddOneOffApiObject.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistSddOneOffApiObject.cs
index 6922638..1b6e4b7 100644
--- a/BunqSdk/Model/Generated/Endpoint/WhitelistSddOneOffApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistSddOneOffApiObject.cs
@@ -43,12 +43,12 @@ public class WhitelistSddOneOffApiObject : BunqModel
         /// The account from which payments will be deducted when a transaction is matched with this whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_paying_id")]
-        public int? MonetaryAccountPayingId { get; set; }
+        public long? MonetaryAccountPayingId { get; set; }
         /// <summary>
         /// ID of the request for which you want to whitelist the originating SDD.
         /// </summary>
         [JsonProperty(PropertyName = "request_id")]
-        public int? RequestId { get; set; }
+        public long? RequestId { get; set; }
         /// <summary>
         /// The monthly maximum amount that can be deducted from the target account.
         /// </summary>
@@ -68,12 +68,12 @@ public class WhitelistSddOneOffApiObject : BunqModel
         /// The ID of the whitelist entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The account to which payments will come in before possibly being 'redirected' by the whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_incoming_id")]
-        public int? MonetaryAccountIncomingId { get; set; }
+        public long? MonetaryAccountIncomingId { get; set; }
         /// <summary>
         /// The type of the SDD whitelist, can be CORE or B2B.
         /// </summary>
@@ -103,7 +103,7 @@ public class WhitelistSddOneOffApiObject : BunqModel
         /// <summary>
         /// Get a specific one off SDD whitelist entry.
         /// </summary>
-        public static BunqResponse<WhitelistSddOneOffApiObject> Get(int whitelistSddOneOffId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<WhitelistSddOneOffApiObject> Get(long whitelistSddOneOffId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -121,7 +121,7 @@ public static BunqResponse<WhitelistSddOneOffApiObject> Get(int whitelistSddOneO
         /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted per month based on the whitelist.</param>
         /// <param name="maximumAmountPerPayment">The maximum amount of money that is allowed to be deducted per payment based on the whitelist.</param>
         /// <param name="routingType">The type of routing for this whitelist. Should be changed to non-optional CIT/technical#12806.</param>
-        public static BunqResponse<int> Create(int? monetaryAccountPayingId, int? requestId, AmountObject maximumAmountPerMonth = null, AmountObject maximumAmountPerPayment = null, string routingType = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long? monetaryAccountPayingId, long? requestId, AmountObject maximumAmountPerMonth = null, AmountObject maximumAmountPerPayment = null, string routingType = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -148,7 +148,7 @@ public static BunqResponse<int> Create(int? monetaryAccountPayingId, int? reques
         /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted per month based on the whitelist.</param>
         /// <param name="maximumAmountPerPayment">The maximum amount of money that is allowed to be deducted per payment based on the whitelist.</param>
         /// <param name="routingType">The type of routing for this whitelist. Should be changed to non-optional CIT/technical#12806.</param>
-        public static BunqResponse<int> Update(int whitelistSddOneOffId, int? monetaryAccountPayingId = null, AmountObject maximumAmountPerMonth = null, AmountObject maximumAmountPerPayment = null, string routingType = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long whitelistSddOneOffId, long? monetaryAccountPayingId = null, AmountObject maximumAmountPerMonth = null, AmountObject maximumAmountPerPayment = null, string routingType = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -170,7 +170,7 @@ public static BunqResponse<int> Update(int whitelistSddOneOffId, int? monetaryAc
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int whitelistSddOneOffId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long whitelistSddOneOffId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistSddRecurringApiObject.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistSddRecurringApiObject.cs
index a40eab3..97e6ece 100644
--- a/BunqSdk/Model/Generated/Endpoint/WhitelistSddRecurringApiObject.cs
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistSddRecurringApiObject.cs
@@ -42,12 +42,12 @@ public class WhitelistSddRecurringApiObject : BunqModel
         /// The account from which payments will be deducted when a transaction is matched with this whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_paying_id")]
-        public int? MonetaryAccountPayingId { get; set; }
+        public long? MonetaryAccountPayingId { get; set; }
         /// <summary>
         /// ID of the request for which you want to whitelist the originating SDD.
         /// </summary>
         [JsonProperty(PropertyName = "request_id")]
-        public int? RequestId { get; set; }
+        public long? RequestId { get; set; }
         /// <summary>
         /// The monthly maximum amount that can be deducted from the target account.
         /// </summary>
@@ -67,12 +67,12 @@ public class WhitelistSddRecurringApiObject : BunqModel
         /// The ID of the whitelist entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The account to which payments will come in before possibly being 'redirected' by the whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_incoming_id")]
-        public int? MonetaryAccountIncomingId { get; set; }
+        public long? MonetaryAccountIncomingId { get; set; }
         /// <summary>
         /// The type of the SDD whitelist, can be CORE or B2B.
         /// </summary>
@@ -107,7 +107,7 @@ public class WhitelistSddRecurringApiObject : BunqModel
         /// <summary>
         /// Get a specific recurring SDD whitelist entry.
         /// </summary>
-        public static BunqResponse<WhitelistSddRecurringApiObject> Get(int whitelistSddRecurringId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<WhitelistSddRecurringApiObject> Get(long whitelistSddRecurringId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -125,7 +125,7 @@ public static BunqResponse<WhitelistSddRecurringApiObject> Get(int whitelistSddR
         /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted per month based on the whitelist.</param>
         /// <param name="maximumAmountPerPayment">The maximum amount of money that is allowed to be deducted per payment based on the whitelist.</param>
         /// <param name="routingType">The type of routing for this whitelist. Should be changed to non-optional CIT/technical#12806.</param>
-        public static BunqResponse<int> Create(int? monetaryAccountPayingId, int? requestId, AmountObject maximumAmountPerMonth = null, AmountObject maximumAmountPerPayment = null, string routingType = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Create(long? monetaryAccountPayingId, long? requestId, AmountObject maximumAmountPerMonth = null, AmountObject maximumAmountPerPayment = null, string routingType = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -152,7 +152,7 @@ public static BunqResponse<int> Create(int? monetaryAccountPayingId, int? reques
         /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted per month based on the whitelist.</param>
         /// <param name="maximumAmountPerPayment">The maximum amount of money that is allowed to be deducted per payment based on the whitelist.</param>
         /// <param name="routingType">The type of routing for this whitelist. Should be changed to non-optional CIT/technical#12806.</param>
-        public static BunqResponse<int> Update(int whitelistSddRecurringId, int? monetaryAccountPayingId = null, AmountObject maximumAmountPerMonth = null, AmountObject maximumAmountPerPayment = null, string routingType = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<long> Update(long whitelistSddRecurringId, long? monetaryAccountPayingId = null, AmountObject maximumAmountPerMonth = null, AmountObject maximumAmountPerPayment = null, string routingType = null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
@@ -174,7 +174,7 @@ public static BunqResponse<int> Update(int whitelistSddRecurringId, int? monetar
     
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int whitelistSddRecurringId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(long whitelistSddRecurringId, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
     
diff --git a/BunqSdk/Model/Generated/Object/AllocationItemObject.cs b/BunqSdk/Model/Generated/Object/AllocationItemObject.cs
new file mode 100644
index 0000000..25c8a26
--- /dev/null
+++ b/BunqSdk/Model/Generated/Object/AllocationItemObject.cs
@@ -0,0 +1,100 @@
+using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Endpoint;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Object
+{
+    /// <summary>
+    /// </summary>
+    public class AllocationItemObject : BunqModel
+    {
+        /// <summary>
+        /// The UUID of the RegistryMembership we are allocating money for. Can be provided instead of the "alias"
+        /// field.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_uuid")]
+        public string MembershipUuid { get; set; }
+        /// <summary>
+        /// The Tricount ID of the membership for backwards compatibility, to be able to handle changed made offline
+        /// before the Tricount migration, but synced to the backend after the Tricount migration.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership_tricount_id")]
+        public long? MembershipTricountId { get; set; }
+        /// <summary>
+        /// The Alias of the party we are allocating money for.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias")]
+        public MonetaryAccountReference Alias { get; set; }
+        /// <summary>
+        /// The type of the AllocationItem.
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+        /// <summary>
+        /// The Amount of the AllocationItem.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount")]
+        public AmountObject Amount { get; set; }
+        /// <summary>
+        /// The Amount of the AllocationItem in the local currency.
+        /// </summary>
+        [JsonProperty(PropertyName = "amount_local")]
+        public AmountObject AmountLocal { get; set; }
+        /// <summary>
+        /// The share ratio of the AllocationItem.
+        /// </summary>
+        [JsonProperty(PropertyName = "share_ratio")]
+        public long? ShareRatio { get; set; }
+        /// <summary>
+        /// The membership.
+        /// </summary>
+        [JsonProperty(PropertyName = "membership")]
+        public RegistryMembershipApiObject Membership { get; set; }
+    
+        public AllocationItemObject(string type)
+        {
+            Type = type;
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Type != null)
+            {
+                return false;
+            }
+    
+            if (this.Membership != null)
+            {
+                return false;
+            }
+    
+            if (this.Amount != null)
+            {
+                return false;
+            }
+    
+            if (this.AmountLocal != null)
+            {
+                return false;
+            }
+    
+            if (this.ShareRatio != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static AllocationItemObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<AllocationItemObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Object/AttachmentMasterCardActionRefundObject.cs b/BunqSdk/Model/Generated/Object/AttachmentMasterCardActionRefundObject.cs
index 5f81e6e..644e8b3 100644
--- a/BunqSdk/Model/Generated/Object/AttachmentMasterCardActionRefundObject.cs
+++ b/BunqSdk/Model/Generated/Object/AttachmentMasterCardActionRefundObject.cs
@@ -12,9 +12,9 @@ public class AttachmentMasterCardActionRefundObject : BunqModel
         /// The id of the attached Attachment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
-        public AttachmentMasterCardActionRefundObject(int? id)
+        public AttachmentMasterCardActionRefundObject(long? id)
         {
             Id = id;
         }
diff --git a/BunqSdk/Model/Generated/Object/AttachmentMonetaryAccountPaymentObject.cs b/BunqSdk/Model/Generated/Object/AttachmentMonetaryAccountPaymentObject.cs
index 47e9b78..bf865a5 100644
--- a/BunqSdk/Model/Generated/Object/AttachmentMonetaryAccountPaymentObject.cs
+++ b/BunqSdk/Model/Generated/Object/AttachmentMonetaryAccountPaymentObject.cs
@@ -12,14 +12,14 @@ public class AttachmentMonetaryAccountPaymentObject : BunqModel
         /// The id of the attached Attachment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The id of the MonetaryAccount this Attachment is attached from.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
     
-        public AttachmentMonetaryAccountPaymentObject(int? id)
+        public AttachmentMonetaryAccountPaymentObject(long? id)
         {
             Id = id;
         }
diff --git a/BunqSdk/Model/Generated/Object/BunqIdObject.cs b/BunqSdk/Model/Generated/Object/BunqIdObject.cs
index c4f9d16..e108c78 100644
--- a/BunqSdk/Model/Generated/Object/BunqIdObject.cs
+++ b/BunqSdk/Model/Generated/Object/BunqIdObject.cs
@@ -12,9 +12,9 @@ public class BunqIdObject : BunqModel
         /// An integer ID of an object. Unique per object type.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
-        public BunqIdObject(int? id)
+        public BunqIdObject(long? id)
         {
             Id = id;
         }
diff --git a/BunqSdk/Model/Generated/Object/CardBatchEntryObject.cs b/BunqSdk/Model/Generated/Object/CardBatchEntryObject.cs
index 5a86bd4..c4840b0 100644
--- a/BunqSdk/Model/Generated/Object/CardBatchEntryObject.cs
+++ b/BunqSdk/Model/Generated/Object/CardBatchEntryObject.cs
@@ -12,7 +12,7 @@ public class CardBatchEntryObject : BunqModel
         /// The ID of the card that needs to be updated.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The status to set for the card. Can be ACTIVE, DEACTIVATED, LOST, STOLEN or CANCELLED, and can only be set
         /// to LOST/STOLEN/CANCELLED when order status is
@@ -43,9 +43,9 @@ public class CardBatchEntryObject : BunqModel
         /// not supplied.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id_fallback")]
-        public int? MonetaryAccountIdFallback { get; set; }
+        public long? MonetaryAccountIdFallback { get; set; }
     
-        public CardBatchEntryObject(int? id)
+        public CardBatchEntryObject(long? id)
         {
             Id = id;
         }
diff --git a/BunqSdk/Model/Generated/Object/CardBatchReplaceEntryObject.cs b/BunqSdk/Model/Generated/Object/CardBatchReplaceEntryObject.cs
index ac0cfec..7eaba18 100644
--- a/BunqSdk/Model/Generated/Object/CardBatchReplaceEntryObject.cs
+++ b/BunqSdk/Model/Generated/Object/CardBatchReplaceEntryObject.cs
@@ -12,7 +12,7 @@ public class CardBatchReplaceEntryObject : BunqModel
         /// The ID of the card that needs to be replaced.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The user's name as it will be on the card. Check 'card-name' for the available card names for a user.
         /// </summary>
@@ -29,7 +29,7 @@ public class CardBatchReplaceEntryObject : BunqModel
         [JsonProperty(PropertyName = "second_line")]
         public string SecondLine { get; set; }
     
-        public CardBatchReplaceEntryObject(int? id)
+        public CardBatchReplaceEntryObject(long? id)
         {
             Id = id;
         }
diff --git a/BunqSdk/Model/Generated/Object/CardCountryPermissionObject.cs b/BunqSdk/Model/Generated/Object/CardCountryPermissionObject.cs
index 96fdd76..3e895f8 100644
--- a/BunqSdk/Model/Generated/Object/CardCountryPermissionObject.cs
+++ b/BunqSdk/Model/Generated/Object/CardCountryPermissionObject.cs
@@ -22,7 +22,7 @@ public class CardCountryPermissionObject : BunqModel
         /// The id of the card country permission entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
         public CardCountryPermissionObject(string country)
         {
diff --git a/BunqSdk/Model/Generated/Object/CardPinAssignmentObject.cs b/BunqSdk/Model/Generated/Object/CardPinAssignmentObject.cs
index 81c4b2c..3bc2fa1 100644
--- a/BunqSdk/Model/Generated/Object/CardPinAssignmentObject.cs
+++ b/BunqSdk/Model/Generated/Object/CardPinAssignmentObject.cs
@@ -27,7 +27,7 @@ public class CardPinAssignmentObject : BunqModel
         /// The ID of the monetary account to assign to this pin for the card.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The status of the card pin assignment.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Object/CardPrimaryAccountNumberObject.cs b/BunqSdk/Model/Generated/Object/CardPrimaryAccountNumberObject.cs
index 7004754..bab806c 100644
--- a/BunqSdk/Model/Generated/Object/CardPrimaryAccountNumberObject.cs
+++ b/BunqSdk/Model/Generated/Object/CardPrimaryAccountNumberObject.cs
@@ -12,7 +12,7 @@ public class CardPrimaryAccountNumberObject : BunqModel
         /// The ID for this Virtual PAN.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The description for this PAN.
         /// </summary>
@@ -27,7 +27,7 @@ public class CardPrimaryAccountNumberObject : BunqModel
         /// The ID of the monetary account to assign to this PAN, only for Online Cards.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
+        public long? MonetaryAccountId { get; set; }
         /// <summary>
         /// The UUID for this Virtual PAN.
         /// </summary>
@@ -44,7 +44,7 @@ public class CardPrimaryAccountNumberObject : BunqModel
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
     
-        public CardPrimaryAccountNumberObject(int? id)
+        public CardPrimaryAccountNumberObject(long? id)
         {
             Id = id;
         }
diff --git a/BunqSdk/Model/Generated/Object/DraftPaymentEntryObject.cs b/BunqSdk/Model/Generated/Object/DraftPaymentEntryObject.cs
index c488518..0b95de8 100644
--- a/BunqSdk/Model/Generated/Object/DraftPaymentEntryObject.cs
+++ b/BunqSdk/Model/Generated/Object/DraftPaymentEntryObject.cs
@@ -39,7 +39,7 @@ public class DraftPaymentEntryObject : BunqModel
         /// The id of the draft payment entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The LabelMonetaryAccount containing the public information of 'this' (party) side of the DraftPayment.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Object/ImageObject.cs b/BunqSdk/Model/Generated/Object/ImageObject.cs
index a7b5575..10eefd0 100644
--- a/BunqSdk/Model/Generated/Object/ImageObject.cs
+++ b/BunqSdk/Model/Generated/Object/ImageObject.cs
@@ -22,12 +22,12 @@ public class ImageObject : BunqModel
         /// The image height in pixels.
         /// </summary>
         [JsonProperty(PropertyName = "height")]
-        public int? Height { get; set; }
+        public long? Height { get; set; }
         /// <summary>
         /// The image width in pixels.
         /// </summary>
         [JsonProperty(PropertyName = "width")]
-        public int? Width { get; set; }
+        public long? Width { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Object/InvoiceItemObject.cs b/BunqSdk/Model/Generated/Object/InvoiceItemObject.cs
index 2a2f94b..a62c10a 100644
--- a/BunqSdk/Model/Generated/Object/InvoiceItemObject.cs
+++ b/BunqSdk/Model/Generated/Object/InvoiceItemObject.cs
@@ -12,7 +12,7 @@ public class InvoiceItemObject : BunqModel
         /// The id of the invoice item.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The billing date of the item.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Object/MasterCardActionReferenceObject.cs b/BunqSdk/Model/Generated/Object/MasterCardActionReferenceObject.cs
index 198ab5d..3f4a15b 100644
--- a/BunqSdk/Model/Generated/Object/MasterCardActionReferenceObject.cs
+++ b/BunqSdk/Model/Generated/Object/MasterCardActionReferenceObject.cs
@@ -12,7 +12,7 @@ public class MasterCardActionReferenceObject : BunqModel
         /// The id of the event.
         /// </summary>
         [JsonProperty(PropertyName = "event_id")]
-        public int? EventId { get; set; }
+        public long? EventId { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Object/NotificationFilterUrlObject.cs b/BunqSdk/Model/Generated/Object/NotificationFilterUrlObject.cs
index 34d2452..2cccba9 100644
--- a/BunqSdk/Model/Generated/Object/NotificationFilterUrlObject.cs
+++ b/BunqSdk/Model/Generated/Object/NotificationFilterUrlObject.cs
@@ -37,7 +37,7 @@ public class NotificationFilterUrlObject : BunqModel
         /// The id of the NotificationFilterUrl.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the NotificationFilterUrl's creation.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Object/OauthCallbackUrlObject.cs b/BunqSdk/Model/Generated/Object/OauthCallbackUrlObject.cs
index cba0bd4..8389574 100644
--- a/BunqSdk/Model/Generated/Object/OauthCallbackUrlObject.cs
+++ b/BunqSdk/Model/Generated/Object/OauthCallbackUrlObject.cs
@@ -12,7 +12,7 @@ public class OauthCallbackUrlObject : BunqModel
         /// The id of the callback URL.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The timestamp of the callback URL's creation.
         /// </summary>
diff --git a/BunqSdk/Model/Generated/Object/PaymentFeeObject.cs b/BunqSdk/Model/Generated/Object/PaymentFeeObject.cs
index 7b01227..4276c53 100644
--- a/BunqSdk/Model/Generated/Object/PaymentFeeObject.cs
+++ b/BunqSdk/Model/Generated/Object/PaymentFeeObject.cs
@@ -22,7 +22,7 @@ public class PaymentFeeObject : BunqModel
         /// The id of the invoice related to possible payment fee.
         /// </summary>
         [JsonProperty(PropertyName = "invoice_id")]
-        public int? InvoiceId { get; set; }
+        public long? InvoiceId { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Object/RegistryEntryAttachmentObject.cs b/BunqSdk/Model/Generated/Object/RegistryEntryAttachmentObject.cs
new file mode 100644
index 0000000..9c3bb21
--- /dev/null
+++ b/BunqSdk/Model/Generated/Object/RegistryEntryAttachmentObject.cs
@@ -0,0 +1,52 @@
+using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Object
+{
+    /// <summary>
+    /// </summary>
+    public class RegistryEntryAttachmentObject : BunqModel
+    {
+        /// <summary>
+        /// The id of the attachment.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public long? Id { get; set; }
+        /// <summary>
+        /// The id of the monetary account to which the attachment belongs.
+        /// </summary>
+        [JsonProperty(PropertyName = "monetary_account_id")]
+        public long? MonetaryAccountId { get; set; }
+    
+        public RegistryEntryAttachmentObject(long? id)
+        {
+            Id = id;
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Id != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountId != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistryEntryAttachmentObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistryEntryAttachmentObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Object/RegistryEntryReferenceObject.cs b/BunqSdk/Model/Generated/Object/RegistryEntryReferenceObject.cs
new file mode 100644
index 0000000..55c2593
--- /dev/null
+++ b/BunqSdk/Model/Generated/Object/RegistryEntryReferenceObject.cs
@@ -0,0 +1,37 @@
+using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Object
+{
+    /// <summary>
+    /// </summary>
+    public class RegistryEntryReferenceObject : BunqModel
+    {
+        /// <summary>
+        /// The object type that will be linked to the RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+        /// <summary>
+        /// The ID of the object that will be used for the RegistryEntry.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public long? Id { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistryEntryReferenceObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistryEntryReferenceObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Object/RegistryMembershipSettingObject.cs b/BunqSdk/Model/Generated/Object/RegistryMembershipSettingObject.cs
new file mode 100644
index 0000000..9a8ea9c
--- /dev/null
+++ b/BunqSdk/Model/Generated/Object/RegistryMembershipSettingObject.cs
@@ -0,0 +1,77 @@
+using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Object
+{
+    /// <summary>
+    /// </summary>
+    public class RegistryMembershipSettingObject : BunqModel
+    {
+        /// <summary>
+        /// The setting for for adding automatically card transactions to the registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "auto_add_card_transaction")]
+        public string AutoAddCardTransaction { get; set; }
+        /// <summary>
+        /// The time when auto add card gets active
+        /// </summary>
+        [JsonProperty(PropertyName = "time_auto_add_card_transaction_start")]
+        public string TimeAutoAddCardTransactionStart { get; set; }
+        /// <summary>
+        /// The time when auto add card gets inactive
+        /// </summary>
+        [JsonProperty(PropertyName = "time_auto_add_card_transaction_end")]
+        public string TimeAutoAddCardTransactionEnd { get; set; }
+        /// <summary>
+        /// The ids of the cards that have been added to registry membership setting.
+        /// </summary>
+        [JsonProperty(PropertyName = "card_ids")]
+        public List<string> CardIds { get; set; }
+        /// <summary>
+        /// The cards of which payments will be automatically added to this Registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "card_labels")]
+        public List<LabelCardObject> CardLabels { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.AutoAddCardTransaction != null)
+            {
+                return false;
+            }
+    
+            if (this.TimeAutoAddCardTransactionStart != null)
+            {
+                return false;
+            }
+    
+            if (this.TimeAutoAddCardTransactionEnd != null)
+            {
+                return false;
+            }
+    
+            if (this.CardIds != null)
+            {
+                return false;
+            }
+    
+            if (this.CardLabels != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static RegistryMembershipSettingObject CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<RegistryMembershipSettingObject>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Object/RequestInquiryReferenceObject.cs b/BunqSdk/Model/Generated/Object/RequestInquiryReferenceObject.cs
index a6d88da..3598de9 100644
--- a/BunqSdk/Model/Generated/Object/RequestInquiryReferenceObject.cs
+++ b/BunqSdk/Model/Generated/Object/RequestInquiryReferenceObject.cs
@@ -17,7 +17,7 @@ public class RequestInquiryReferenceObject : BunqModel
         /// The id of the request inquiry (batch).
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
     
         /// <summary>
diff --git a/BunqSdk/Model/Generated/Object/TaxResidentObject.cs b/BunqSdk/Model/Generated/Object/TaxResidentObject.cs
index e0788c2..d2534de 100644
--- a/BunqSdk/Model/Generated/Object/TaxResidentObject.cs
+++ b/BunqSdk/Model/Generated/Object/TaxResidentObject.cs
@@ -27,7 +27,7 @@ public class TaxResidentObject : BunqModel
         /// The id of the tax resident.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
     
         public TaxResidentObject(string country, string taxNumber)
         {
diff --git a/BunqSdk/Model/Generated/Object/WhitelistResultViewAnchoredObjectObject.cs b/BunqSdk/Model/Generated/Object/WhitelistResultViewAnchoredObjectObject.cs
index 49d3136..ca9d9ea 100644
--- a/BunqSdk/Model/Generated/Object/WhitelistResultViewAnchoredObjectObject.cs
+++ b/BunqSdk/Model/Generated/Object/WhitelistResultViewAnchoredObjectObject.cs
@@ -13,7 +13,7 @@ public class WhitelistResultViewAnchoredObjectObject : BunqModel
         /// The ID of the whitelist entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
+        public long? Id { get; set; }
         /// <summary>
         /// The RequestResponse object
         /// </summary>