diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentConversationContent.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentConversationContent.cs
index c3db2d1..a071452 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentConversationContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentConversationContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,41 +19,38 @@ public class AttachmentConversationContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/chat-conversation/{1}/attachment/{2}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "AttachmentConversationContent";
-
+    
         /// <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(int chatConversationId, int attachmentId, 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_LISTING, DetermineUserId(), chatConversationId, attachmentId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), chatConversationId, attachmentId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentConversationContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentConversationContent>(json);
+            return BunqModel.CreateFromJsonString<AttachmentConversationContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccount.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccount.cs
index 2f024b0..dccef70 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccount.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccount.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,42 +20,38 @@ public class AttachmentMonetaryAccount : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/attachment";
-
-
+    
+    
         /// <summary>
         /// The attachment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public Attachment Attachment { get; set; }
-
+    
         /// <summary>
         /// The ID of the attachment created.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new monetary account attachment. Create a POST request with a payload that contains the binary
         /// representation of the file, without any JSON wrapping. Make sure you define the MIME type (i.e. image/jpeg)
         /// 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<int> Create(byte[] requestBytes, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -60,20 +60,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Id != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentMonetaryAccount CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentMonetaryAccount>(json);
+            return BunqModel.CreateFromJsonString<AttachmentMonetaryAccount>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountContent.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountContent.cs
index c42073b..97ceb2f 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentMonetaryAccountContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,43 +19,38 @@ public class AttachmentMonetaryAccountContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/attachment/{2}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "AttachmentMonetaryAccountContent";
-
+    
         /// <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(int attachmentId, int? 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_LISTING, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId), attachmentId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), attachmentId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentMonetaryAccountContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentMonetaryAccountContent>(json);
+            return BunqModel.CreateFromJsonString<AttachmentMonetaryAccountContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentPublic.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentPublic.cs
index 2b344be..6491a79 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentPublic.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentPublic.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -17,71 +21,69 @@ public class AttachmentPublic : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "attachment-public";
         protected const string ENDPOINT_URL_READ = "attachment-public/{0}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "Uuid";
         private const string OBJECT_TYPE_GET = "AttachmentPublic";
-
+    
         /// <summary>
         /// The UUID of the attachment.
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the attachment's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the attachment's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The attachment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public Attachment Attachment { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new public attachment. Create a POST request with a payload that contains a binary representation
         /// of the file, without any JSON wrapping. Make sure you define the MIME type (i.e. image/jpeg, or image/png)
         /// 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<string> Create(byte[] requestBytes, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<string> Create(byte[] requestBytes,  IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
             var responseRaw = apiClient.Post(ENDPOINT_URL_CREATE, requestBytes, customHeaders);
-
+    
             return ProcessForUuid(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a specific attachment's metadata through its UUID. The Content-Type header of the response will describe
         /// the MIME type of the attachment file.
         /// </summary>
-        public static BunqResponse<AttachmentPublic> Get(string attachmentPublicUuid,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<AttachmentPublic> Get(string attachmentPublicUuid, 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, attachmentPublicUuid),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, attachmentPublicUuid), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<AttachmentPublic>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -90,30 +92,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentPublic CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentPublic>(json);
+            return BunqModel.CreateFromJsonString<AttachmentPublic>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentPublicContent.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentPublicContent.cs
index 26a6c6f..7a0703d 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentPublicContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentPublicContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,40 +19,38 @@ public class AttachmentPublicContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "attachment-public/{0}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "AttachmentPublicContent";
-
+    
         /// <summary>
         /// Get the raw content of a specific attachment.
         /// </summary>
-        public static BunqResponse<byte[]> List(string attachmentPublicUuid,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(string attachmentPublicUuid, 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_LISTING, attachmentPublicUuid),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, attachmentPublicUuid), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentPublicContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentPublicContent>(json);
+            return BunqModel.CreateFromJsonString<AttachmentPublicContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentTab.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentTab.cs
index 1829bad..4c68196 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentTab.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentTab.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -17,75 +21,67 @@ public class AttachmentTab : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/attachment-tab";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/attachment-tab/{2}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "AttachmentTab";
-
+    
         /// <summary>
         /// The id of the attachment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the attachment's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the attachment's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The attachment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public Attachment Attachment { get; set; }
-
-
+    
+    
         /// <summary>
         /// Upload a new attachment to use with a tab, and to read its metadata. Create a POST request with a payload
         /// that contains the binary representation of the file, without any JSON wrapping. Make sure you define the
         /// MIME type (i.e. image/jpeg) 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<int> Create(byte[] requestBytes, int? monetaryAccountId= null, IDictionary<string, string> customHeaders = null)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a specific attachment. The header of the response contains the content-type of the attachment.
         /// </summary>
-        public static BunqResponse<AttachmentTab> Get(int attachmentTabId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<AttachmentTab> Get(int attachmentTabId, int? 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),
-                        attachmentTabId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), attachmentTabId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<AttachmentTab>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -94,30 +90,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentTab CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentTab>(json);
+            return BunqModel.CreateFromJsonString<AttachmentTab>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentTabContent.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentTabContent.cs
index fa01446..4a5e039 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentTabContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentTabContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,43 +19,38 @@ public class AttachmentTabContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/attachment-tab/{2}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "AttachmentTabContent";
-
+    
         /// <summary>
         /// Get the raw content of a specific attachment.
         /// </summary>
-        public static BunqResponse<byte[]> List(int attachmentTabId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(int attachmentTabId, int? 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_LISTING, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId), attachmentTabId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), attachmentTabId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentTabContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentTabContent>(json);
+            return BunqModel.CreateFromJsonString<AttachmentTabContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentUser.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentUser.cs
index 1b6a6d0..30727dd 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentUser.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,53 +20,51 @@ public class AttachmentUser : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/attachment/{1}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "AttachmentUser";
-
+    
         /// <summary>
         /// The id of the attachment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the attachment's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the attachment's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The attachment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public Attachment Attachment { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get a specific attachment. The header of the response contains the content-type of the attachment.
         /// </summary>
-        public static BunqResponse<AttachmentUser> Get(int attachmentUserId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<AttachmentUser> Get(int attachmentUserId, 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(), attachmentUserId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), attachmentUserId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<AttachmentUser>(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -71,30 +73,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentUser>(json);
+            return BunqModel.CreateFromJsonString<AttachmentUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/AttachmentUserContent.cs b/BunqSdk/Model/Generated/Endpoint/AttachmentUserContent.cs
index 684b714..055dc5f 100644
--- a/BunqSdk/Model/Generated/Endpoint/AttachmentUserContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/AttachmentUserContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,39 +19,38 @@ public class AttachmentUserContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/attachment/{1}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "AttachmentUserContent";
-
+    
         /// <summary>
         /// Get the raw content of a specific attachment.
         /// </summary>
         public static BunqResponse<byte[]> List(int attachmentId, 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_LISTING, DetermineUserId(), attachmentId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), attachmentId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentUserContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentUserContent>(json);
+            return BunqModel.CreateFromJsonString<AttachmentUserContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Avatar.cs b/BunqSdk/Model/Generated/Endpoint/Avatar.cs
index 621108f..1fb624d 100644
--- a/BunqSdk/Model/Generated/Endpoint/Avatar.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Avatar.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,72 +23,70 @@ public class Avatar : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "avatar";
         protected const string ENDPOINT_URL_READ = "avatar/{0}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_ATTACHMENT_PUBLIC_UUID = "attachment_public_uuid";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "Uuid";
         private const string OBJECT_TYPE_GET = "Avatar";
-
+    
         /// <summary>
         /// The public UUID of the public attachment from which an avatar image must be created.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_public_uuid")]
         public string AttachmentPublicUuid { get; set; }
-
+    
         /// <summary>
         /// The UUID of the created avatar.
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The content type of the image.
         /// </summary>
         [JsonProperty(PropertyName = "image")]
         public List<Image> Image { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="attachmentPublicUuid">The public UUID of the public attachment from which an avatar image must be created.</param>
-        public static BunqResponse<string> Create(string attachmentPublicUuid,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<string> Create(string attachmentPublicUuid, 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_ATTACHMENT_PUBLIC_UUID, attachmentPublicUuid},
-            };
-
+    {
+    {FIELD_ATTACHMENT_PUBLIC_UUID, attachmentPublicUuid},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
             var responseRaw = apiClient.Post(ENDPOINT_URL_CREATE, requestBytes, customHeaders);
-
+    
             return ProcessForUuid(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqResponse<Avatar> Get(string avatarUuid, 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, avatarUuid),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, avatarUuid), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Avatar>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -95,20 +95,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Image != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Avatar CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Avatar>(json);
+            return BunqModel.CreateFromJsonString<Avatar>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncoming.cs b/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncoming.cs
index db8eb2f..72097bd 100644
--- a/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncoming.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncoming.cs
@@ -1,6 +1,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -15,63 +16,64 @@ public class BankSwitchServiceNetherlandsIncoming : BunqModel
         public const string FIELD_ALIAS = "alias";
         public const string FIELD_COUNTERPARTY_ALIAS = "counterparty_alias";
         public const string FIELD_STATUS = "status";
-
-
+    
+    
         /// <summary>
         /// The label of the monetary of this switch service.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The IBAN alias that's displayed for this switch service.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The status of the switch service.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The label of the user creator of this switch service.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias")]
         public LabelUser UserAlias { get; set; }
-
+    
         /// <summary>
         /// The sub status of the switch service.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the switch service desired to be start.
         /// </summary>
         [JsonProperty(PropertyName = "time_start_desired")]
         public string TimeStartDesired { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the switch service actually starts.
         /// </summary>
         [JsonProperty(PropertyName = "time_start_actual")]
         public string TimeStartActual { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the switch service ends.
         /// </summary>
         [JsonProperty(PropertyName = "time_end")]
         public string TimeEnd { get; set; }
-
+    
         /// <summary>
         /// Reference to the bank transfer form for this switch-service.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public Attachment Attachment { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -80,55 +82,55 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.TimeStartDesired != null)
             {
                 return false;
             }
-
+    
             if (this.TimeStartActual != null)
             {
                 return false;
             }
-
+    
             if (this.TimeEnd != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BankSwitchServiceNetherlandsIncoming CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BankSwitchServiceNetherlandsIncoming>(json);
+            return BunqModel.CreateFromJsonString<BankSwitchServiceNetherlandsIncoming>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncomingPayment.cs b/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncomingPayment.cs
index 4fe0012..5e138c2 100644
--- a/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncomingPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BankSwitchServiceNetherlandsIncomingPayment.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -15,44 +19,38 @@ public class BankSwitchServiceNetherlandsIncomingPayment : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/switch-service-payment/{2}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "BankSwitchServiceNetherlandsIncomingPayment";
-
+    
         /// <summary>
         /// The bank switch service details.
         /// </summary>
         [JsonProperty(PropertyName = "bank_switch_service")]
         public BankSwitchServiceNetherlandsIncoming BankSwitchService { get; set; }
-
+    
         /// <summary>
         /// The payment made using bank switch service.
         /// </summary>
         [JsonProperty(PropertyName = "payment")]
         public Payment Payment { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<BankSwitchServiceNetherlandsIncomingPayment> Get(
-            int bankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BankSwitchServiceNetherlandsIncomingPayment> Get(int bankSwitchServiceNetherlandsIncomingPaymentId, int? 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),
-                        bankSwitchServiceNetherlandsIncomingPaymentId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bankSwitchServiceNetherlandsIncomingPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<BankSwitchServiceNetherlandsIncomingPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -61,20 +59,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Payment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BankSwitchServiceNetherlandsIncomingPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BankSwitchServiceNetherlandsIncomingPayment>(json);
+            return BunqModel.CreateFromJsonString<BankSwitchServiceNetherlandsIncomingPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BillingContractSubscription.cs b/BunqSdk/Model/Generated/Endpoint/BillingContractSubscription.cs
index 2d56160..93138c5 100644
--- a/BunqSdk/Model/Generated/Endpoint/BillingContractSubscription.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BillingContractSubscription.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,97 +18,95 @@ public class BillingContractSubscription : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/billing-contract-subscription";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_SUBSCRIPTION_TYPE = "subscription_type";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "BillingContractSubscription";
-
+    
         /// <summary>
         /// The subscription type of the user. Can be one of PERSON_SUPER_LIGHT_V1, PERSON_LIGHT_V1, PERSON_MORE_V1,
         /// PERSON_FREE_V1, PERSON_PREMIUM_V1, COMPANY_V1, or COMPANY_V2.
         /// </summary>
         [JsonProperty(PropertyName = "subscription_type")]
         public string SubscriptionType { get; set; }
-
+    
         /// <summary>
         /// The id of the billing contract.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the billing contract was made.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the billing contract was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The date from when the billing contract is valid.
         /// </summary>
         [JsonProperty(PropertyName = "contract_date_start")]
         public string ContractDateStart { get; set; }
-
+    
         /// <summary>
         /// The date until when the billing contract is valid.
         /// </summary>
         [JsonProperty(PropertyName = "contract_date_end")]
         public string ContractDateEnd { get; set; }
-
+    
         /// <summary>
         /// The version of the billing contract.
         /// </summary>
         [JsonProperty(PropertyName = "contract_version")]
         public int? ContractVersion { get; set; }
-
+    
         /// <summary>
         /// The subscription type the user will have after a subscription downgrade. Will be null if downgrading is not
         /// possible.
         /// </summary>
         [JsonProperty(PropertyName = "subscription_type_downgrade")]
         public string SubscriptionTypeDowngrade { get; set; }
-
+    
         /// <summary>
         /// The subscription status.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The subscription substatus.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get all subscription billing contract for the authenticated user.
         /// </summary>
-        public static BunqResponse<List<BillingContractSubscription>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<BillingContractSubscription>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<BillingContractSubscription>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -113,60 +115,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.ContractDateStart != null)
             {
                 return false;
             }
-
+    
             if (this.ContractDateEnd != null)
             {
                 return false;
             }
-
+    
             if (this.ContractVersion != null)
             {
                 return false;
             }
-
+    
             if (this.SubscriptionType != null)
             {
                 return false;
             }
-
+    
             if (this.SubscriptionTypeDowngrade != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BillingContractSubscription CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BillingContractSubscription>(json);
+            return BunqModel.CreateFromJsonString<BillingContractSubscription>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfile.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfile.cs
index 7513f6a..729c0ba 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfile.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfile.cs
@@ -1,5 +1,7 @@
 using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -12,58 +14,65 @@ public class BunqMeFundraiserProfile : BunqModel
         /// Field constants.
         /// </summary>
         public const string FIELD_POINTER = "pointer";
-
-
+    
+    
         /// <summary>
         /// The pointer (url) which will be used to access the bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "pointer")]
         public MonetaryAccountReference Pointer { get; set; }
-
+    
         /// <summary>
         /// The color chosen for the bunq.me fundraiser profile in hexadecimal format.
         /// </summary>
         [JsonProperty(PropertyName = "color")]
         public string Color { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the User and the MonetaryAccount that created the
         /// bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
+        /// <summary>
+        /// The currency of the MonetaryAccount that created the bunq.me fundraiser profile.
+        /// </summary>
+        [JsonProperty(PropertyName = "currency")]
+        public string Currency { get; set; }
+    
         /// <summary>
         /// The description of the bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public AttachmentPublic Attachment { get; set; }
-
+    
         /// <summary>
         /// The status of the bunq.me fundraiser profile, can be ACTIVE or DEACTIVATED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The URL which the user is sent to when a payment is completed.
         /// </summary>
         [JsonProperty(PropertyName = "redirect_url")]
         public string RedirectUrl { get; set; }
-
+    
         /// <summary>
         /// Provided if the user has enabled their invite link.
         /// </summary>
         [JsonProperty(PropertyName = "invite_profile_name")]
         public string InviteProfileName { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -72,50 +81,55 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
+            if (this.Currency != null)
+            {
+                return false;
+            }
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             if (this.Pointer != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.RedirectUrl != null)
             {
                 return false;
             }
-
+    
             if (this.InviteProfileName != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqMeFundraiserProfile CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqMeFundraiserProfile>(json);
+            return BunqModel.CreateFromJsonString<BunqMeFundraiserProfile>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfileUser.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfileUser.cs
index 43f97ac..41f8340 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfileUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserProfileUser.cs
@@ -1,7 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,7 +20,7 @@ public class BunqMeFundraiserProfileUser : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/bunqme-fundraiser-profile/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/bunqme-fundraiser-profile";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -26,105 +31,106 @@ public class BunqMeFundraiserProfileUser : BunqModel
         public const string FIELD_POINTER = "pointer";
         public const string FIELD_REDIRECT_URL = "redirect_url";
         public const string FIELD_STATUS = "status";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "BunqMeFundraiserProfileModel";
-
+    
         /// <summary>
         /// 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; }
-
+    
         /// <summary>
         /// The color chosen for the bunq.me fundraiser profile in hexadecimal format.
         /// </summary>
         [JsonProperty(PropertyName = "color")]
         public string Color { get; set; }
-
+    
         /// <summary>
         /// The description of the bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The public UUID of the public attachment from which an avatar image must be created.
         /// </summary>
         [JsonProperty(PropertyName = "attachment_public_uuid")]
         public string AttachmentPublicUuid { get; set; }
-
+    
         /// <summary>
         /// The pointer (url) which will be used to access the bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "pointer")]
         public MonetaryAccountReference Pointer { get; set; }
-
+    
         /// <summary>
         /// The URL which the user is sent to when a payment is completed.
         /// </summary>
         [JsonProperty(PropertyName = "redirect_url")]
         public string RedirectUrl { get; set; }
-
+    
         /// <summary>
         /// The status of the bunq.me fundraiser profile, can be ACTIVE or DEACTIVATED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// Id of the user owning the profile.
         /// </summary>
         [JsonProperty(PropertyName = "owner_user_id")]
         public int? OwnerUserId { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the User and the MonetaryAccount that created the
         /// bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
+        /// <summary>
+        /// The currency of the MonetaryAccount that created the bunq.me fundraiser profile.
+        /// </summary>
+        [JsonProperty(PropertyName = "currency")]
+        public string Currency { get; set; }
+    
         /// <summary>
         /// The attachment used for the background of the bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public AttachmentPublic Attachment { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<BunqMeFundraiserProfileUser> Get(int bunqMeFundraiserProfileUserId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BunqMeFundraiserProfileUser> Get(int bunqMeFundraiserProfileUserId, 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(), bunqMeFundraiserProfileUserId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), bunqMeFundraiserProfileUserId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<BunqMeFundraiserProfileUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<BunqMeFundraiserProfileUser>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<BunqMeFundraiserProfileUser>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<BunqMeFundraiserProfileUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -133,55 +139,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.OwnerUserId != null)
             {
                 return false;
             }
-
+    
             if (this.Color != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
+            if (this.Currency != null)
+            {
+                return false;
+            }
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             if (this.Pointer != null)
             {
                 return false;
             }
-
+    
             if (this.RedirectUrl != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqMeFundraiserProfileUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqMeFundraiserProfileUser>(json);
+            return BunqModel.CreateFromJsonString<BunqMeFundraiserProfileUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserResult.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserResult.cs
index 49034bb..9b66665 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserResult.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeFundraiserResult.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,60 +18,56 @@ public class BunqMeFundraiserResult : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "BunqMeFundraiserResult";
-
+    
         /// <summary>
         /// The id of the bunq.me.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the bunq.me was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the bunq.me was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "bunqme_fundraiser_profile")]
         public BunqMeFundraiserProfile BunqmeFundraiserProfile { get; set; }
-
+    
         /// <summary>
         /// The list of payments, paid to the bunq.me fundraiser profile.
         /// </summary>
         [JsonProperty(PropertyName = "payments")]
         public List<Payment> Payments { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<BunqMeFundraiserResult> Get(int bunqMeFundraiserResultId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BunqMeFundraiserResult> Get(int bunqMeFundraiserResultId, int? 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),
-                        bunqMeFundraiserResultId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqMeFundraiserResultId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<BunqMeFundraiserResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -76,35 +76,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.BunqmeFundraiserProfile != null)
             {
                 return false;
             }
-
+    
             if (this.Payments != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqMeFundraiserResult CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqMeFundraiserResult>(json);
+            return BunqModel.CreateFromJsonString<BunqMeFundraiserResult>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeTab.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeTab.cs
index f2b2c83..c1360c3 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeTab.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeTab.cs
@@ -1,9 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,157 +23,160 @@ public class BunqMeTab : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/bunqme-tab/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/bunqme-tab";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/bunqme-tab/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_BUNQME_TAB_ENTRY = "bunqme_tab_entry";
         public const string FIELD_STATUS = "status";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "BunqMeTab";
-
+    
         /// <summary>
         /// The bunq.me entry containing the payment information.
         /// </summary>
         [JsonProperty(PropertyName = "bunqme_tab_entry")]
         public BunqMeTabEntry BunqmeTabEntry { get; set; }
-
+    
         /// <summary>
         /// The status of the bunq.me. Can be WAITING_FOR_PAYMENT, CANCELLED or EXPIRED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The id of the created bunq.me.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the bunq.me was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the bunq.me was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the bunq.me expired or will expire.
         /// </summary>
         [JsonProperty(PropertyName = "time_expiry")]
         public string TimeExpiry { get; set; }
-
+    
         /// <summary>
         /// The id of the MonetaryAccount the bunq.me was sent from.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { get; set; }
-
+    
+        /// <summary>
+        /// The type of the bunq.me Tab. Can be BUNQ_ME or SPLIT_RECEIPT.
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+    
+        /// <summary>
+        /// The LabelMonetaryAccount with the public information of the User and the MonetaryAccount that created the
+        /// bunq.me link.
+        /// </summary>
+        [JsonProperty(PropertyName = "alias_monetary_account")]
+        public MonetaryAccountReference AliasMonetaryAccount { get; set; }
+    
         /// <summary>
         /// The url that points to the bunq.me page.
         /// </summary>
         [JsonProperty(PropertyName = "bunqme_tab_share_url")]
         public string BunqmeTabShareUrl { get; set; }
-
+    
+        /// <summary>
+        /// The bunq.me tab entries attached to this bunq.me Tab.
+        /// </summary>
+        [JsonProperty(PropertyName = "bunqme_tab_entries")]
+        public List<BunqMeTabEntry> BunqmeTabEntries { get; set; }
+    
         /// <summary>
         /// The list of bunq.me result Inquiries successfully made and paid.
         /// </summary>
         [JsonProperty(PropertyName = "result_inquiries")]
         public List<BunqMeTabResultInquiry> ResultInquiries { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <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>
-        public static BunqResponse<int> Create(BunqMeTabEntry bunqmeTabEntry, int? monetaryAccountId = null,
-            string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(BunqMeTabEntry bunqmeTabEntry, int? 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_BUNQME_TAB_ENTRY, bunqmeTabEntry},
-                {FIELD_STATUS, status},
-            };
-
+    {
+    {FIELD_BUNQME_TAB_ENTRY, bunqmeTabEntry},
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int bunqMeTabId, int? 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},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        bunqMeTabId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqMeTabId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<BunqMeTab>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<BunqMeTab>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<BunqMeTab>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<BunqMeTab> Get(int bunqMeTabId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BunqMeTab> Get(int bunqMeTabId, int? 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),
-                        bunqMeTabId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqMeTabId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<BunqMeTab>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -179,55 +185,70 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.TimeExpiry != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
+            if (this.Type != null)
+            {
+                return false;
+            }
+    
+            if (this.AliasMonetaryAccount != null)
+            {
+                return false;
+            }
+    
             if (this.BunqmeTabShareUrl != null)
             {
                 return false;
             }
-
+    
             if (this.BunqmeTabEntry != null)
             {
                 return false;
             }
-
+    
+            if (this.BunqmeTabEntries != null)
+            {
+                return false;
+            }
+    
             if (this.ResultInquiries != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqMeTab CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqMeTab>(json);
+            return BunqModel.CreateFromJsonString<BunqMeTab>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeTabEntry.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeTabEntry.cs
index ce6167d..0670642 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeTabEntry.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeTabEntry.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -17,52 +17,53 @@ public class BunqMeTabEntry : BunqModel
         public const string FIELD_AMOUNT_INQUIRED = "amount_inquired";
         public const string FIELD_DESCRIPTION = "description";
         public const string FIELD_REDIRECT_URL = "redirect_url";
-
-
+    
+    
         /// <summary>
         /// The requested Amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_inquired")]
         public Amount AmountInquired { get; set; }
-
+    
         /// <summary>
         /// The description for the bunq.me. Maximum 9000 characters.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The URL which the user is sent to when a payment is completed.
         /// </summary>
         [JsonProperty(PropertyName = "redirect_url")]
         public string RedirectUrl { get; set; }
-
+    
         /// <summary>
         /// The uuid of the bunq.me.
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the User and the MonetaryAccount that created the
         /// bunq.me link.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The status of the bunq.me. Can be WAITING_FOR_PAYMENT, CANCELLED or EXPIRED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// List of available merchants.
         /// </summary>
         [JsonProperty(PropertyName = "merchant_available")]
         public List<BunqMeMerchantAvailable> MerchantAvailable { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -71,45 +72,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.AmountInquired != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.RedirectUrl != null)
             {
                 return false;
             }
-
+    
             if (this.MerchantAvailable != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqMeTabEntry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqMeTabEntry>(json);
+            return BunqModel.CreateFromJsonString<BunqMeTabEntry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultInquiry.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultInquiry.cs
index ac4e912..b043fae 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultInquiry.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultInquiry.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -14,14 +15,15 @@ public class BunqMeTabResultInquiry : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// The Id of the bunq.me tab that this BunqMeTabResultInquiry belongs to.
         /// </summary>
         [JsonProperty(PropertyName = "bunq_me_tab_id")]
         public int? BunqMeTabId { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -30,20 +32,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.BunqMeTabId != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqMeTabResultInquiry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqMeTabResultInquiry>(json);
+            return BunqModel.CreateFromJsonString<BunqMeTabResultInquiry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultResponse.cs b/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultResponse.cs
index 6823c02..6c82fcb 100644
--- a/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultResponse.cs
+++ b/BunqSdk/Model/Generated/Endpoint/BunqMeTabResultResponse.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -15,35 +19,31 @@ public class BunqMeTabResultResponse : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/bunqme-tab-result-response/{2}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "BunqMeTabResultResponse";
-
+    
         /// <summary>
         /// The payment made for the bunq.me tab.
         /// </summary>
         [JsonProperty(PropertyName = "payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<BunqMeTabResultResponse> Get(int bunqMeTabResultResponseId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<BunqMeTabResultResponse> Get(int bunqMeTabResultResponseId, int? 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),
-                        bunqMeTabResultResponseId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqMeTabResultResponseId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<BunqMeTabResultResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -52,15 +52,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqMeTabResultResponse CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqMeTabResultResponse>(json);
+            return BunqModel.CreateFromJsonString<BunqMeTabResultResponse>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Card.cs b/BunqSdk/Model/Generated/Endpoint/Card.cs
index 184384a..45b995d 100644
--- a/BunqSdk/Model/Generated/Endpoint/Card.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Card.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,188 +21,189 @@ public class Card : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/card/{1}";
         protected const string ENDPOINT_URL_READ = "user/{0}/card/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/card";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_PIN_CODE = "pin_code";
         public const string FIELD_ACTIVATION_CODE = "activation_code";
         public const string FIELD_STATUS = "status";
+        public const string FIELD_ORDER_STATUS = "order_status";
         public const string FIELD_CARD_LIMIT = "card_limit";
         public const string FIELD_CARD_LIMIT_ATM = "card_limit_atm";
         public const string FIELD_COUNTRY_PERMISSION = "country_permission";
         public const string FIELD_PIN_CODE_ASSIGNMENT = "pin_code_assignment";
         public const string FIELD_PRIMARY_ACCOUNT_NUMBERS = "primary_account_numbers";
         public const string FIELD_MONETARY_ACCOUNT_ID_FALLBACK = "monetary_account_id_fallback";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_PUT = "CardDebit";
         private const string OBJECT_TYPE_GET = "CardDebit";
-
+    
         /// <summary>
         /// The plaintext pin code. Requests require encryption to be enabled.
         /// </summary>
         [JsonProperty(PropertyName = "pin_code")]
         public string PinCode { get; set; }
-
+    
         /// <summary>
         /// DEPRECATED: Activate a card by setting status to ACTIVE when the order_status is ACCEPTED_FOR_PRODUCTION.
         /// </summary>
         [JsonProperty(PropertyName = "activation_code")]
         public string ActivationCode { get; set; }
-
+    
         /// <summary>
         /// The status to set for the card. Can be ACTIVE, DEACTIVATED, LOST, STOLEN, CANCELLED, EXPIRED or
         /// PIN_TRIES_EXCEEDED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { 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,
+        /// CARD_UPDATE_SENT, CARD_UPDATE_ACCEPTED, VIRTUAL_DELIVERY, NEW_CARD_REQUEST_PENDING_USER_APPROVAL,
+        /// SENT_FOR_DELIVERY or NEW_CARD_REQUEST_CANCELLED.
+        /// </summary>
+        [JsonProperty(PropertyName = "order_status")]
+        public string OrderStatus { get; set; }
+    
         /// <summary>
         /// The spending limit for the card.
         /// </summary>
         [JsonProperty(PropertyName = "card_limit")]
         public Amount CardLimit { get; set; }
-
+    
         /// <summary>
         /// The ATM spending limit for the card.
         /// </summary>
         [JsonProperty(PropertyName = "card_limit_atm")]
         public Amount CardLimitAtm { get; set; }
-
+    
         /// <summary>
         /// The countries for which to grant (temporary) permissions to use the card.
         /// </summary>
         [JsonProperty(PropertyName = "country_permission")]
         public List<CardCountryPermission> CountryPermission { get; set; }
-
+    
         /// <summary>
         /// Array of Types, PINs, account IDs assigned to the card.
         /// </summary>
         [JsonProperty(PropertyName = "pin_code_assignment")]
         public List<CardPinAssignment> PinCodeAssignment { get; set; }
-
+    
         /// <summary>
         /// Array of PANs and their attributes.
         /// </summary>
         [JsonProperty(PropertyName = "primary_account_numbers")]
         public List<CardPrimaryAccountNumber> PrimaryAccountNumbers { get; set; }
-
+    
         /// <summary>
         /// ID of the MA to be used as fallback for this card if insufficient balance. Fallback account is removed if
         /// not supplied.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id_fallback")]
         public int? MonetaryAccountIdFallback { get; set; }
-
+    
         /// <summary>
         /// The id of the card.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the card's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the card's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The public UUID of the card.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The type of the card. Can be MAESTRO, MASTERCARD.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The sub-type of the card.
         /// </summary>
         [JsonProperty(PropertyName = "sub_type")]
         public string SubType { get; set; }
-
+    
         /// <summary>
         /// The second line of text on the card
         /// </summary>
         [JsonProperty(PropertyName = "second_line")]
         public string SecondLine { get; set; }
-
+    
         /// <summary>
         /// ID of the user who is owner of the card.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
         public int? UserId { get; set; }
-
+    
         /// <summary>
         /// The sub-status of the card. Can be NONE or REPLACED.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { 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,
-        /// CARD_UPDATE_SENT, CARD_UPDATE_ACCEPTED, VIRTUAL_DELIVERY, NEW_CARD_REQUEST_PENDING_USER_APPROVAL,
-        /// SENT_FOR_DELIVERY or NEW_CARD_REQUEST_CANCELLED.
-        /// </summary>
-        [JsonProperty(PropertyName = "order_status")]
-        public string OrderStatus { get; set; }
-
+    
         /// <summary>
         /// Expiry date of the card.
         /// </summary>
         [JsonProperty(PropertyName = "expiry_date")]
         public string ExpiryDate { get; set; }
-
+    
         /// <summary>
         /// The user's name on the card.
         /// </summary>
         [JsonProperty(PropertyName = "name_on_card")]
         public string NameOnCard { get; set; }
-
+    
         /// <summary>
         /// The monetary account this card was ordered on and the label user that owns the card.
         /// </summary>
         [JsonProperty(PropertyName = "label_monetary_account_ordered")]
         public MonetaryAccountReference LabelMonetaryAccountOrdered { get; set; }
-
+    
         /// <summary>
         /// The monetary account that this card is currently linked to and the label user viewing it.
         /// </summary>
         [JsonProperty(PropertyName = "label_monetary_account_current")]
         public MonetaryAccountReference LabelMonetaryAccountCurrent { get; set; }
-
+    
         /// <summary>
         /// The country that is domestic to the card. Defaults to country of residence of user.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// A tracking link provided by our shipment provider.
         /// </summary>
         [JsonProperty(PropertyName = "card_shipment_tracking_url")]
         public string CardShipmentTrackingUrl { get; set; }
-
+    
         /// <summary>
         /// The amount saved through ZeroFX on this card.
         /// </summary>
         [JsonProperty(PropertyName = "amount_saved_zero_fx")]
         public Amount AmountSavedZeroFx { get; set; }
-
-
+    
+    
         /// <summary>
         /// Update the card details. Allow to change pin code, status, limits, country permissions and the monetary
         /// account connected to the card. When the card has been received, it can be also activated through this
@@ -209,73 +212,67 @@ public class Card : BunqModel
         /// <param name="pinCode">The plaintext pin code. Requests require encryption to be enabled.</param>
         /// <param name="activationCode">DEPRECATED: Activate a card by setting status to ACTIVE when the order_status is ACCEPTED_FOR_PRODUCTION.</param>
         /// <param name="status">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 ACCEPTED_FOR_PRODUCTION/DELIVERED_TO_CUSTOMER/CARD_UPDATE_REQUESTED/CARD_UPDATE_SENT/CARD_UPDATE_ACCEPTED. Can only be set to DEACTIVATED after initial activation, i.e. order_status is DELIVERED_TO_CUSTOMER/CARD_UPDATE_REQUESTED/CARD_UPDATE_SENT/CARD_UPDATE_ACCEPTED. Mind that all the possible choices (apart from ACTIVE and DEACTIVATED) are permanent and cannot be changed after.</param>
+        /// <param name="orderStatus">The order status to set for the card. Set to CARD_REQUEST_PENDING to get a virtual card produced.</param>
         /// <param name="cardLimit">The spending limit for the card.</param>
         /// <param name="cardLimitAtm">The ATM spending limit for the card.</param>
         /// <param name="countryPermission">The countries for which to grant (temporary) permissions to use the card.</param>
         /// <param name="pinCodeAssignment">Array of Types, PINs, account IDs assigned to the card.</param>
         /// <param name="primaryAccountNumbers">Array of PANs and their attributes.</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>
-        public static BunqResponse<Card> Update(int cardId, string pinCode = null, string activationCode = null,
-            string status = null, Amount cardLimit = null, Amount cardLimitAtm = null,
-            List<CardCountryPermission> countryPermission = null, List<CardPinAssignment> pinCodeAssignment = null,
-            List<CardPrimaryAccountNumber> primaryAccountNumbers = null, int? monetaryAccountIdFallback = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<Card> Update(int cardId, string pinCode = null, string activationCode = null, string status = null, string orderStatus = null, Amount cardLimit = null, Amount cardLimitAtm = null, List<CardCountryPermission> countryPermission = null, List<CardPinAssignment> pinCodeAssignment = null, List<CardPrimaryAccountNumber> primaryAccountNumbers = null, int? monetaryAccountIdFallback = 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_PIN_CODE, pinCode},
-                {FIELD_ACTIVATION_CODE, activationCode},
-                {FIELD_STATUS, status},
-                {FIELD_CARD_LIMIT, cardLimit},
-                {FIELD_CARD_LIMIT_ATM, cardLimitAtm},
-                {FIELD_COUNTRY_PERMISSION, countryPermission},
-                {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
-                {FIELD_PRIMARY_ACCOUNT_NUMBERS, primaryAccountNumbers},
-                {FIELD_MONETARY_ACCOUNT_ID_FALLBACK, monetaryAccountIdFallback},
-            };
-
+    {
+    {FIELD_PIN_CODE, pinCode},
+    {FIELD_ACTIVATION_CODE, activationCode},
+    {FIELD_STATUS, status},
+    {FIELD_ORDER_STATUS, orderStatus},
+    {FIELD_CARD_LIMIT, cardLimit},
+    {FIELD_CARD_LIMIT_ATM, cardLimitAtm},
+    {FIELD_COUNTRY_PERMISSION, countryPermission},
+    {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
+    {FIELD_PRIMARY_ACCOUNT_NUMBERS, primaryAccountNumbers},
+    {FIELD_MONETARY_ACCOUNT_ID_FALLBACK, monetaryAccountIdFallback},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), cardId), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), cardId), requestBytes, customHeaders);
+    
             return FromJson<Card>(responseRaw, OBJECT_TYPE_PUT);
         }
-
+    
         /// <summary>
         /// Return the details of a specific card.
         /// </summary>
         public static BunqResponse<Card> Get(int cardId, 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(), cardId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), cardId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Card>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Return all the cards available to the user.
         /// </summary>
-        public static BunqResponse<List<Card>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Card>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<Card>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -284,130 +281,130 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.SubType != null)
             {
                 return false;
             }
-
+    
             if (this.SecondLine != null)
             {
                 return false;
             }
-
+    
             if (this.UserId != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.OrderStatus != null)
             {
                 return false;
             }
-
+    
             if (this.ExpiryDate != null)
             {
                 return false;
             }
-
+    
             if (this.NameOnCard != null)
             {
                 return false;
             }
-
+    
             if (this.PrimaryAccountNumbers != null)
             {
                 return false;
             }
-
+    
             if (this.CardLimit != null)
             {
                 return false;
             }
-
+    
             if (this.CardLimitAtm != null)
             {
                 return false;
             }
-
+    
             if (this.CountryPermission != null)
             {
                 return false;
             }
-
+    
             if (this.LabelMonetaryAccountOrdered != null)
             {
                 return false;
             }
-
+    
             if (this.LabelMonetaryAccountCurrent != null)
             {
                 return false;
             }
-
+    
             if (this.PinCodeAssignment != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountIdFallback != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             if (this.CardShipmentTrackingUrl != null)
             {
                 return false;
             }
-
+    
             if (this.AmountSavedZeroFx != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Card CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Card>(json);
+            return BunqModel.CreateFromJsonString<Card>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CardBatch.cs b/BunqSdk/Model/Generated/Endpoint/CardBatch.cs
index 379f5a3..22db5f6 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -17,53 +19,51 @@ public class CardBatch : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/card-batch";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_CARDS = "cards";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "CardBatch";
-
+    
         /// <summary>
         /// The cards that need to be updated.
         /// </summary>
         [JsonProperty(PropertyName = "cards")]
         public List<CardBatchEntry> Cards { get; set; }
-
+    
         /// <summary>
         /// The ids of the cards that have been updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated_card_ids")]
         public List<BunqId> UpdatedCardIds { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="cards">The cards that need to be updated.</param>
-        public static BunqResponse<CardBatch> Create(List<CardBatchEntry> cards,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CardBatch> Create(List<CardBatchEntry> cards, 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_CARDS, cards},
-            };
-
+    {
+    {FIELD_CARDS, cards},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return FromJson<CardBatch>(responseRaw, OBJECT_TYPE_POST);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -72,15 +72,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardBatch>(json);
+            return BunqModel.CreateFromJsonString<CardBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CardBatchReplace.cs b/BunqSdk/Model/Generated/Endpoint/CardBatchReplace.cs
new file mode 100644
index 0000000..a94d478
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/CardBatchReplace.cs
@@ -0,0 +1,86 @@
+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 replace multiple cards in a batch.
+    /// </summary>
+    public class CardBatchReplace : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/card-batch-replace";
+    
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_CARDS = "cards";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_POST = "CardBatchReplace";
+    
+        /// <summary>
+        /// The cards that need to be replaced.
+        /// </summary>
+        [JsonProperty(PropertyName = "cards")]
+        public List<CardBatchReplaceEntry> Cards { get; set; }
+    
+        /// <summary>
+        /// The ids of the cards that have been replaced.
+        /// </summary>
+        [JsonProperty(PropertyName = "updated_card_ids")]
+        public List<BunqId> UpdatedCardIds { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        /// <param name="cards">The cards that need to be replaced.</param>
+        public static BunqResponse<CardBatchReplace> Create(List<CardBatchReplaceEntry> cards, 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_CARDS, cards},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
+            return FromJson<CardBatchReplace>(responseRaw, OBJECT_TYPE_POST);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.UpdatedCardIds != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static CardBatchReplace CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<CardBatchReplace>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CardCredit.cs b/BunqSdk/Model/Generated/Endpoint/CardCredit.cs
index 2be52ee..119abd6 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardCredit.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardCredit.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,205 +20,214 @@ public class CardCredit : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/card-credit";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_SECOND_LINE = "second_line";
         public const string FIELD_NAME_ON_CARD = "name_on_card";
+        public const string FIELD_PREFERRED_NAME_ON_CARD = "preferred_name_on_card";
         public const string FIELD_ALIAS = "alias";
         public const string FIELD_TYPE = "type";
         public const string FIELD_PRODUCT_TYPE = "product_type";
         public const string FIELD_PIN_CODE_ASSIGNMENT = "pin_code_assignment";
         public const string FIELD_MONETARY_ACCOUNT_ID_FALLBACK = "monetary_account_id_fallback";
-
+        public const string FIELD_ORDER_STATUS = "order_status";
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "CardCredit";
-
+    
         /// <summary>
         /// The second line of text on the card
         /// </summary>
         [JsonProperty(PropertyName = "second_line")]
         public string SecondLine { get; set; }
-
+    
         /// <summary>
         /// The user's name on the card.
         /// </summary>
         [JsonProperty(PropertyName = "name_on_card")]
         public string NameOnCard { get; set; }
-
+    
+        /// <summary>
+        /// The user's preferred name that can be put on the card.
+        /// </summary>
+        [JsonProperty(PropertyName = "preferred_name_on_card")]
+        public string PreferredNameOnCard { get; set; }
+    
         /// <summary>
         /// The pointer to the monetary account that will be connected at first with the card. Its IBAN code is also the
         /// one that will be printed on the card itself. The pointer must be of type IBAN.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The type of the card. Can is MASTERCARD.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The product type of the card.
         /// </summary>
         [JsonProperty(PropertyName = "product_type")]
         public string ProductType { get; set; }
-
+    
         /// <summary>
         /// Array of Types, PINs, account IDs assigned to the card.
         /// </summary>
         [JsonProperty(PropertyName = "pin_code_assignment")]
         public List<CardPinAssignment> PinCodeAssignment { get; set; }
-
+    
         /// <summary>
         /// ID of the MA to be used as fallback for this card if insufficient balance. Fallback account is removed if
         /// not supplied.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id_fallback")]
         public int? 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,
+        /// CARD_UPDATE_SENT, CARD_UPDATE_ACCEPTED, VIRTUAL_DELIVERY, NEW_CARD_REQUEST_PENDING_USER_APPROVAL,
+        /// SENT_FOR_DELIVERY or NEW_CARD_REQUEST_CANCELLED.
+        /// </summary>
+        [JsonProperty(PropertyName = "order_status")]
+        public string OrderStatus { get; set; }
+    
         /// <summary>
         /// The id of the card.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the card's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the card's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The public UUID of the card.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The sub-type of the card.
         /// </summary>
         [JsonProperty(PropertyName = "sub_type")]
         public string SubType { get; set; }
-
+    
         /// <summary>
         /// The status to set for the card. Can be ACTIVE, DEACTIVATED, LOST, STOLEN, CANCELLED, EXPIRED or
         /// PIN_TRIES_EXCEEDED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The sub-status of the card. Can be NONE or REPLACED.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { 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,
-        /// CARD_UPDATE_SENT, CARD_UPDATE_ACCEPTED, VIRTUAL_DELIVERY, NEW_CARD_REQUEST_PENDING_USER_APPROVAL,
-        /// SENT_FOR_DELIVERY or NEW_CARD_REQUEST_CANCELLED.
-        /// </summary>
-        [JsonProperty(PropertyName = "order_status")]
-        public string OrderStatus { get; set; }
-
+    
         /// <summary>
         /// Expiry date of the card.
         /// </summary>
         [JsonProperty(PropertyName = "expiry_date")]
         public string ExpiryDate { get; set; }
-
+    
         /// <summary>
         /// The spending limit for the card.
         /// </summary>
         [JsonProperty(PropertyName = "card_limit")]
         public Amount CardLimit { get; set; }
-
+    
         /// <summary>
         /// The ATM spending limit for the card.
         /// </summary>
         [JsonProperty(PropertyName = "card_limit_atm")]
         public Amount CardLimitAtm { get; set; }
-
+    
         /// <summary>
         /// The countries for which to grant (temporary) permissions to use the card.
         /// </summary>
         [JsonProperty(PropertyName = "country_permission")]
         public List<CardCountryPermission> CountryPermission { get; set; }
-
+    
         /// <summary>
         /// The monetary account this card was ordered on and the label user that owns the card.
         /// </summary>
         [JsonProperty(PropertyName = "label_monetary_account_ordered")]
         public MonetaryAccountReference LabelMonetaryAccountOrdered { get; set; }
-
+    
         /// <summary>
         /// The monetary account that this card is currently linked to and the label user viewing it.
         /// </summary>
         [JsonProperty(PropertyName = "label_monetary_account_current")]
         public MonetaryAccountReference LabelMonetaryAccountCurrent { get; set; }
-
+    
         /// <summary>
         /// The country that is domestic to the card. Defaults to country of residence of user.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// A tracking link provided by our shipment provider.
         /// </summary>
         [JsonProperty(PropertyName = "card_shipment_tracking_url")]
         public string CardShipmentTrackingUrl { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new credit card request.
         /// </summary>
         /// <param name="secondLine">The second line of text on the card, used as name/description for it. It can contain at most 17 characters and it can be empty.</param>
         /// <param name="nameOnCard">The user's name as it will be on the card. Check 'card-name' for the available card names for a user.</param>
         /// <param name="type">The type of card to order. Can be MASTERCARD.</param>
+        /// <param name="preferredNameOnCard">The user's preferred name that can be put on the card.</param>
         /// <param name="alias">The pointer to the monetary account that will be connected at first with the card. Its IBAN code is also the one that will be printed on the card itself. The pointer must be of type IBAN.</param>
         /// <param name="productType">The product type of the card to order.</param>
         /// <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>
-        public static BunqResponse<CardCredit> Create(string secondLine, string nameOnCard, string type,
-            Pointer alias = null, string productType = null, List<CardPinAssignment> pinCodeAssignment = null,
-            int? monetaryAccountIdFallback = null, IDictionary<string, string> customHeaders = null)
+        /// <param name="orderStatus">The order status of this card. Can be CARD_REQUEST_PENDING or VIRTUAL_DELIVERY.</param>
+        public static BunqResponse<CardCredit> Create(string secondLine, string nameOnCard, string type, string preferredNameOnCard = null, Pointer alias = null, string productType = null, List<CardPinAssignment> pinCodeAssignment = null, int? monetaryAccountIdFallback = null, string orderStatus = 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_SECOND_LINE, secondLine},
-                {FIELD_NAME_ON_CARD, nameOnCard},
-                {FIELD_ALIAS, alias},
-                {FIELD_TYPE, type},
-                {FIELD_PRODUCT_TYPE, productType},
-                {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
-                {FIELD_MONETARY_ACCOUNT_ID_FALLBACK, monetaryAccountIdFallback},
-            };
-
+    {
+    {FIELD_SECOND_LINE, secondLine},
+    {FIELD_NAME_ON_CARD, nameOnCard},
+    {FIELD_PREFERRED_NAME_ON_CARD, preferredNameOnCard},
+    {FIELD_ALIAS, alias},
+    {FIELD_TYPE, type},
+    {FIELD_PRODUCT_TYPE, productType},
+    {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
+    {FIELD_MONETARY_ACCOUNT_ID_FALLBACK, monetaryAccountIdFallback},
+    {FIELD_ORDER_STATUS, orderStatus},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return FromJson<CardCredit>(responseRaw, OBJECT_TYPE_POST);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -225,120 +236,125 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.SubType != null)
             {
                 return false;
             }
-
+    
             if (this.ProductType != null)
             {
                 return false;
             }
-
+    
             if (this.SecondLine != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.OrderStatus != null)
             {
                 return false;
             }
-
+    
             if (this.ExpiryDate != null)
             {
                 return false;
             }
-
+    
             if (this.NameOnCard != null)
             {
                 return false;
             }
-
+    
+            if (this.PreferredNameOnCard != null)
+            {
+                return false;
+            }
+    
             if (this.CardLimit != null)
             {
                 return false;
             }
-
+    
             if (this.CardLimitAtm != null)
             {
                 return false;
             }
-
+    
             if (this.CountryPermission != null)
             {
                 return false;
             }
-
+    
             if (this.LabelMonetaryAccountOrdered != null)
             {
                 return false;
             }
-
+    
             if (this.LabelMonetaryAccountCurrent != null)
             {
                 return false;
             }
-
+    
             if (this.PinCodeAssignment != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountIdFallback != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             if (this.CardShipmentTrackingUrl != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardCredit CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardCredit>(json);
+            return BunqModel.CreateFromJsonString<CardCredit>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CardDebit.cs b/BunqSdk/Model/Generated/Endpoint/CardDebit.cs
index 22ee3f8..27307d1 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardDebit.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardDebit.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,185 +20,194 @@ public class CardDebit : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/card-debit";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_SECOND_LINE = "second_line";
         public const string FIELD_NAME_ON_CARD = "name_on_card";
+        public const string FIELD_PREFERRED_NAME_ON_CARD = "preferred_name_on_card";
         public const string FIELD_ALIAS = "alias";
         public const string FIELD_TYPE = "type";
         public const string FIELD_PRODUCT_TYPE = "product_type";
         public const string FIELD_PIN_CODE_ASSIGNMENT = "pin_code_assignment";
         public const string FIELD_MONETARY_ACCOUNT_ID_FALLBACK = "monetary_account_id_fallback";
-
+        public const string FIELD_ORDER_STATUS = "order_status";
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "CardDebit";
-
+    
         /// <summary>
         /// The second line of text on the card
         /// </summary>
         [JsonProperty(PropertyName = "second_line")]
         public string SecondLine { get; set; }
-
+    
         /// <summary>
         /// The user's name as will be on the card
         /// </summary>
         [JsonProperty(PropertyName = "name_on_card")]
         public string NameOnCard { get; set; }
-
+    
+        /// <summary>
+        /// The user's preferred name that can be put on the card.
+        /// </summary>
+        [JsonProperty(PropertyName = "preferred_name_on_card")]
+        public string PreferredNameOnCard { get; set; }
+    
         /// <summary>
         /// The label for the user who requested the card.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public LabelUser Alias { get; set; }
-
+    
         /// <summary>
         /// The type of the card. Can be MAESTRO, MASTERCARD.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The product type of the card to order.
         /// </summary>
         [JsonProperty(PropertyName = "product_type")]
         public string ProductType { get; set; }
-
+    
         /// <summary>
         /// Array of Types, PINs, account IDs assigned to the card.
         /// </summary>
         [JsonProperty(PropertyName = "pin_code_assignment")]
         public List<CardPinAssignment> PinCodeAssignment { get; set; }
-
+    
         /// <summary>
         /// ID of the MA to be used as fallback for this card if insufficient balance. Fallback account is removed if
         /// not supplied.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id_fallback")]
         public int? 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,
+        /// CARD_UPDATE_SENT, CARD_UPDATE_ACCEPTED, VIRTUAL_DELIVERY, NEW_CARD_REQUEST_PENDING_USER_APPROVAL,
+        /// SENT_FOR_DELIVERY or NEW_CARD_REQUEST_CANCELLED.
+        /// </summary>
+        [JsonProperty(PropertyName = "order_status")]
+        public string OrderStatus { get; set; }
+    
         /// <summary>
         /// The id of the card.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the card was crated.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the card was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The public UUID of the card.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The sub_type of card.
         /// </summary>
         [JsonProperty(PropertyName = "sub_type")]
         public string SubType { get; set; }
-
+    
         /// <summary>
         /// The status to set for the card. After ordering the card it will be DEACTIVATED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { 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,
-        /// CARD_UPDATE_SENT, CARD_UPDATE_ACCEPTED, VIRTUAL_DELIVERY, NEW_CARD_REQUEST_PENDING_USER_APPROVAL,
-        /// SENT_FOR_DELIVERY or NEW_CARD_REQUEST_CANCELLED.
-        /// </summary>
-        [JsonProperty(PropertyName = "order_status")]
-        public string OrderStatus { get; set; }
-
+    
         /// <summary>
         /// The expiry date of the card.
         /// </summary>
         [JsonProperty(PropertyName = "expiry_date")]
         public string ExpiryDate { get; set; }
-
+    
         /// <summary>
         /// The countries for which to grant (temporary) permissions to use the card.
         /// </summary>
         [JsonProperty(PropertyName = "country_permission")]
         public List<CardCountryPermission> CountryPermission { get; set; }
-
+    
         /// <summary>
         /// The monetary account this card was ordered on and the label user that owns the card.
         /// </summary>
         [JsonProperty(PropertyName = "label_monetary_account_ordered")]
         public MonetaryAccountReference LabelMonetaryAccountOrdered { get; set; }
-
+    
         /// <summary>
         /// The monetary account that this card is currently linked to and the label user viewing it.
         /// </summary>
         [JsonProperty(PropertyName = "label_monetary_account_current")]
         public MonetaryAccountReference LabelMonetaryAccountCurrent { get; set; }
-
+    
         /// <summary>
         /// The country that is domestic to the card. Defaults to country of residence of user.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// A tracking link provided by our shipment provider.
         /// </summary>
         [JsonProperty(PropertyName = "card_shipment_tracking_url")]
         public string CardShipmentTrackingUrl { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new debit card request.
         /// </summary>
         /// <param name="secondLine">The second line of text on the card, used as name/description for it. It can contain at most 17 characters and it can be empty.</param>
         /// <param name="nameOnCard">The user's name as it will be on the card. Check 'card-name' for the available card names for a user.</param>
         /// <param name="type">The type of card to order. Can be MAESTRO or MASTERCARD.</param>
+        /// <param name="preferredNameOnCard">The user's preferred name that can be put on the card.</param>
         /// <param name="alias">The pointer to the monetary account that will be connected at first with the card. Its IBAN code is also the one that will be printed on the card itself. The pointer must be of type IBAN.</param>
         /// <param name="productType">The product type of the card to order.</param>
         /// <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>
-        public static BunqResponse<CardDebit> Create(string secondLine, string nameOnCard, string type,
-            Pointer alias = null, string productType = null, List<CardPinAssignment> pinCodeAssignment = null,
-            int? monetaryAccountIdFallback = null, IDictionary<string, string> customHeaders = null)
+        /// <param name="orderStatus">The order status of this card. Can be CARD_REQUEST_PENDING or VIRTUAL_DELIVERY.</param>
+        public static BunqResponse<CardDebit> Create(string secondLine, string nameOnCard, string type, string preferredNameOnCard = null, Pointer alias = null, string productType = null, List<CardPinAssignment> pinCodeAssignment = null, int? monetaryAccountIdFallback = null, string orderStatus = 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_SECOND_LINE, secondLine},
-                {FIELD_NAME_ON_CARD, nameOnCard},
-                {FIELD_ALIAS, alias},
-                {FIELD_TYPE, type},
-                {FIELD_PRODUCT_TYPE, productType},
-                {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
-                {FIELD_MONETARY_ACCOUNT_ID_FALLBACK, monetaryAccountIdFallback},
-            };
-
+    {
+    {FIELD_SECOND_LINE, secondLine},
+    {FIELD_NAME_ON_CARD, nameOnCard},
+    {FIELD_PREFERRED_NAME_ON_CARD, preferredNameOnCard},
+    {FIELD_ALIAS, alias},
+    {FIELD_TYPE, type},
+    {FIELD_PRODUCT_TYPE, productType},
+    {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
+    {FIELD_MONETARY_ACCOUNT_ID_FALLBACK, monetaryAccountIdFallback},
+    {FIELD_ORDER_STATUS, orderStatus},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return FromJson<CardDebit>(responseRaw, OBJECT_TYPE_POST);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -205,105 +216,110 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.SubType != null)
             {
                 return false;
             }
-
+    
             if (this.SecondLine != null)
             {
                 return false;
             }
-
+    
             if (this.NameOnCard != null)
             {
                 return false;
             }
-
+    
+            if (this.PreferredNameOnCard != null)
+            {
+                return false;
+            }
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.OrderStatus != null)
             {
                 return false;
             }
-
+    
             if (this.ExpiryDate != null)
             {
                 return false;
             }
-
+    
             if (this.CountryPermission != null)
             {
                 return false;
             }
-
+    
             if (this.LabelMonetaryAccountOrdered != null)
             {
                 return false;
             }
-
+    
             if (this.LabelMonetaryAccountCurrent != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.PinCodeAssignment != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountIdFallback != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             if (this.CardShipmentTrackingUrl != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardDebit CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardDebit>(json);
+            return BunqModel.CreateFromJsonString<CardDebit>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CardGeneratedCvc2.cs b/BunqSdk/Model/Generated/Endpoint/CardGeneratedCvc2.cs
index ef122a7..b597d0e 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardGeneratedCvc2.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardGeneratedCvc2.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,139 +21,129 @@ public class CardGeneratedCvc2 : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/card/{1}/generated-cvc2/{2}";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/card/{1}/generated-cvc2/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/card/{1}/generated-cvc2";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_TYPE = "type";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CardGeneratedCvc2";
-
+    
         /// <summary>
         /// The type of generated cvc2. Can be STATIC or GENERATED.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The id of the cvc code.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the cvc code's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the cvc code's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The cvc2 code.
         /// </summary>
         [JsonProperty(PropertyName = "cvc2")]
         public string Cvc2 { get; set; }
-
+    
         /// <summary>
         /// The status of the cvc2. Can be AVAILABLE, USED, EXPIRED, BLOCKED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// Expiry time of the cvc2.
         /// </summary>
         [JsonProperty(PropertyName = "expiry_time")]
         public string ExpiryTime { get; set; }
-
-
+    
+    
         /// <summary>
         /// 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<int> Create(int cardId, string type = 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_TYPE, type},
-            };
-
+    {
+    {FIELD_TYPE, type},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), cardId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), cardId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get the details for a specific generated CVC2 code.
         /// </summary>
-        public static BunqResponse<CardGeneratedCvc2> Get(int cardId, int cardGeneratedCvc2Id,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CardGeneratedCvc2> Get(int cardId, int cardGeneratedCvc2Id, 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(), cardId, cardGeneratedCvc2Id),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), cardId, cardGeneratedCvc2Id), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<CardGeneratedCvc2>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <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<int> Update(int cardId, int cardGeneratedCvc2Id, string type = 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_TYPE, type},
-            };
-
+    {
+    {FIELD_TYPE, type},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), cardId, cardGeneratedCvc2Id),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), cardId, cardGeneratedCvc2Id), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get all generated CVC2 codes for a card.
         /// </summary>
-        public static BunqResponse<List<CardGeneratedCvc2>> List(int cardId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<CardGeneratedCvc2>> List(int 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), cardId), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), cardId), urlParams, customHeaders);
+    
             return FromJsonList<CardGeneratedCvc2>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -160,45 +152,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.Cvc2 != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.ExpiryTime != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardGeneratedCvc2 CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardGeneratedCvc2>(json);
+            return BunqModel.CreateFromJsonString<CardGeneratedCvc2>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CardName.cs b/BunqSdk/Model/Generated/Endpoint/CardName.cs
index f2dbc6b..e72ac90 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardName.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardName.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -16,35 +20,33 @@ public class CardName : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/card-name";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CardUserNameArray";
-
+    
         /// <summary>
         /// All possible variations (of suitable length) of user's legal name for the debit card.
         /// </summary>
         [JsonProperty(PropertyName = "possible_card_name_array")]
         public List<string> PossibleCardNameArray { get; set; }
-
+    
         /// <summary>
         /// Return all the accepted card names for a specific user.
         /// </summary>
-        public static BunqResponse<List<CardName>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<CardName>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<CardName>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -53,15 +55,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardName CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardName>(json);
+            return BunqModel.CreateFromJsonString<CardName>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CardReplace.cs b/BunqSdk/Model/Generated/Endpoint/CardReplace.cs
index 2a18de7..ceaa7dc 100644
--- a/BunqSdk/Model/Generated/Endpoint/CardReplace.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CardReplace.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,69 +22,75 @@ public class CardReplace : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/card/{1}/replace";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_NAME_ON_CARD = "name_on_card";
+        public const string FIELD_PREFERRED_NAME_ON_CARD = "preferred_name_on_card";
         public const string FIELD_PIN_CODE_ASSIGNMENT = "pin_code_assignment";
         public const string FIELD_SECOND_LINE = "second_line";
-
-
+    
+    
         /// <summary>
         /// The user's name as it will be on the card. Check 'card-name' for the available card names for a user.
         /// </summary>
         [JsonProperty(PropertyName = "name_on_card")]
         public string NameOnCard { get; set; }
-
+    
+        /// <summary>
+        /// The user's preferred name that can be put on the card.
+        /// </summary>
+        [JsonProperty(PropertyName = "preferred_name_on_card")]
+        public string PreferredNameOnCard { get; set; }
+    
         /// <summary>
         /// Array of Types, PINs, account IDs assigned to the card.
         /// </summary>
         [JsonProperty(PropertyName = "pin_code_assignment")]
         public List<CardPinAssignment> PinCodeAssignment { get; set; }
-
+    
         /// <summary>
         /// The second line on the card.
         /// </summary>
         [JsonProperty(PropertyName = "second_line")]
         public string SecondLine { get; set; }
-
+    
         /// <summary>
         /// The id of the new card.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
-
+    
+    
         /// <summary>
         /// Request a card replacement.
         /// </summary>
         /// <param name="nameOnCard">The user's name as it will be on the card. Check 'card-name' for the available card names for a user.</param>
+        /// <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,
-            List<CardPinAssignment> pinCodeAssignment = null, string secondLine = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int cardId, string nameOnCard = null, string preferredNameOnCard = null, List<CardPinAssignment> pinCodeAssignment = null, string secondLine = 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_NAME_ON_CARD, nameOnCard},
-                {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
-                {FIELD_SECOND_LINE, secondLine},
-            };
-
+    {
+    {FIELD_NAME_ON_CARD, nameOnCard},
+    {FIELD_PREFERRED_NAME_ON_CARD, preferredNameOnCard},
+    {FIELD_PIN_CODE_ASSIGNMENT, pinCodeAssignment},
+    {FIELD_SECOND_LINE, secondLine},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), cardId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), cardId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -91,15 +99,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardReplace CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardReplace>(json);
+            return BunqModel.CreateFromJsonString<CardReplace>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CashRegister.cs b/BunqSdk/Model/Generated/Endpoint/CashRegister.cs
index 6670d1c..af537c3 100644
--- a/BunqSdk/Model/Generated/Endpoint/CashRegister.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CashRegister.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -24,7 +26,7 @@ public class CashRegister : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/cash-register/{2}";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/cash-register/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -33,68 +35,68 @@ public class CashRegister : BunqModel
         public const string FIELD_AVATAR_UUID = "avatar_uuid";
         public const string FIELD_LOCATION = "location";
         public const string FIELD_TAB_TEXT_WAITING_SCREEN = "tab_text_waiting_screen";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CashRegister";
-
+    
         /// <summary>
         /// The name of the CashRegister.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
+    
         /// <summary>
         /// The status of the CashRegister. Can be PENDING_APPROVAL, ACTIVE, DENIED or CLOSED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The UUID of the avatar of the CashRegister. 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 geolocation of the CashRegister. Can be null.
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public Geolocation Location { get; set; }
-
+    
         /// <summary>
         /// The tab text for waiting screen of CashRegister.
         /// </summary>
         [JsonProperty(PropertyName = "tab_text_waiting_screen")]
         public List<TabTextWaitingScreen> TabTextWaitingScreen { get; set; }
-
+    
         /// <summary>
         /// The id of the created CashRegister.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the CashRegister's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the CashRegister's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The Avatar of the CashRegister.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new CashRegister. Only an UserCompany can create a CashRegisters. They need to be created with
         /// status PENDING_APPROVAL, an bunq admin has to approve your CashRegister before you can use it. In the
@@ -105,49 +107,40 @@ public class CashRegister : BunqModel
         /// <param name="avatarUuid">The UUID of the avatar of the CashRegister. Use the calls /attachment-public and /avatar to create a new Avatar and get its UUID.</param>
         /// <param name="location">The geolocation of the CashRegister.</param>
         /// <param name="tabTextWaitingScreen">The tab text for waiting screen of CashRegister.</param>
-        public static BunqResponse<int> Create(string name, string status, string avatarUuid,
-            int? monetaryAccountId = null, Geolocation location = null,
-            List<TabTextWaitingScreen> tabTextWaitingScreen = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(string name, string status, string avatarUuid, int? monetaryAccountId= null, Geolocation location = null, List<TabTextWaitingScreen> tabTextWaitingScreen = 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_NAME, name},
-                {FIELD_STATUS, status},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_LOCATION, location},
-                {FIELD_TAB_TEXT_WAITING_SCREEN, tabTextWaitingScreen},
-            };
-
+    {
+    {FIELD_NAME, name},
+    {FIELD_STATUS, status},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_LOCATION, location},
+    {FIELD_TAB_TEXT_WAITING_SCREEN, tabTextWaitingScreen},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a specific CashRegister.
         /// </summary>
-        public static BunqResponse<CashRegister> Get(int cashRegisterId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CashRegister> Get(int cashRegisterId, int? 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),
-                        cashRegisterId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<CashRegister>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Modify or close an existing CashRegister. You must set the status back to PENDING_APPROVAL if you modify the
         /// name, avatar or location of a CashRegister. To close a cash register put its status to CLOSED.
@@ -157,51 +150,42 @@ public static BunqResponse<CashRegister> Get(int cashRegisterId, int? monetaryAc
         /// <param name="avatarUuid">The UUID of the avatar of the CashRegister. Use the calls /attachment-public and /avatar to create a new Avatar and get its UUID.</param>
         /// <param name="location">The geolocation of the CashRegister.</param>
         /// <param name="tabTextWaitingScreen">The tab text for waiting screen of CashRegister.</param>
-        public static BunqResponse<int> Update(int cashRegisterId, int? monetaryAccountId = null, string name = null,
-            string status = null, string avatarUuid = null, Geolocation location = null,
-            List<TabTextWaitingScreen> tabTextWaitingScreen = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int cashRegisterId, int? monetaryAccountId= null, string name = null, string status = null, string avatarUuid = null, Geolocation location = null, List<TabTextWaitingScreen> tabTextWaitingScreen = 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_NAME, name},
-                {FIELD_STATUS, status},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_LOCATION, location},
-                {FIELD_TAB_TEXT_WAITING_SCREEN, tabTextWaitingScreen},
-            };
-
+    {
+    {FIELD_NAME, name},
+    {FIELD_STATUS, status},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_LOCATION, location},
+    {FIELD_TAB_TEXT_WAITING_SCREEN, tabTextWaitingScreen},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a collection of CashRegister for a given user and monetary account.
         /// </summary>
-        public static BunqResponse<List<CashRegister>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<CashRegister>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<CashRegister>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -210,50 +194,50 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Name != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.Location != null)
             {
                 return false;
             }
-
+    
             if (this.TabTextWaitingScreen != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CashRegister CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CashRegister>(json);
+            return BunqModel.CreateFromJsonString<CashRegister>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CashRegisterQrCode.cs b/BunqSdk/Model/Generated/Endpoint/CashRegisterQrCode.cs
index 66d7dd8..349dee8 100644
--- a/BunqSdk/Model/Generated/Endpoint/CashRegisterQrCode.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CashRegisterQrCode.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,142 +23,126 @@ public class CashRegisterQrCode : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/cash-register/{2}/qr-code/{3}";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/cash-register/{2}/qr-code/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register/{2}/qr-code";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_STATUS = "status";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TokenQrCashRegister";
-
+    
         /// <summary>
         /// The status of this QR code. If the status is "ACTIVE" the QR code can be scanned to see the linked
         /// CashRegister and tab. If the status is "INACTIVE" the QR code does not link to a anything.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The id of the created QR code. Use this id to get the RAW content of the QR code with:
         /// ../qr-code/{id}/content
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the QR code's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the TokenQrCashRegister's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The CashRegister that is linked to the token.
         /// </summary>
         [JsonProperty(PropertyName = "cash_register")]
         public CashRegister CashRegister { get; set; }
-
+    
         /// <summary>
         /// Holds the Tab object. Can be TabUsageSingle, TabUsageMultiple or null
         /// </summary>
         [JsonProperty(PropertyName = "tab_object")]
         public Tab TabObject { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new QR code for this CashRegister. You can only have one ACTIVE CashRegister QR code at the time.
         /// </summary>
         /// <param name="status">The status of the QR code. ACTIVE or INACTIVE. Only one QR code can be ACTIVE for a CashRegister at any time. Setting a QR code to ACTIVE will deactivate any other CashRegister QR codes.</param>
-        public static BunqResponse<int> Create(int cashRegisterId, string status, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int cashRegisterId, string status, int? 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>
-            {
-                {FIELD_STATUS, status},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Modify a QR code in a given CashRegister. You can only have one ACTIVE CashRegister QR code at the time.
         /// </summary>
         /// <param name="status">The status of the QR code. ACTIVE or INACTIVE. Only one QR code can be ACTIVE for a CashRegister at any time. Setting a QR code to ACTIVE will deactivate any other CashRegister QR codes.</param>
-        public static BunqResponse<int> Update(int cashRegisterId, int cashRegisterQrCodeId,
-            int? monetaryAccountId = null, string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int cashRegisterId, int cashRegisterQrCodeId, int? 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},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId, cashRegisterQrCodeId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, cashRegisterQrCodeId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get the information of a specific QR code. To get the RAW content of the QR code use ../qr-code/{id}/content
         /// </summary>
-        public static BunqResponse<CashRegisterQrCode> Get(int cashRegisterId, int cashRegisterQrCodeId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CashRegisterQrCode> Get(int cashRegisterId, int cashRegisterQrCodeId, int? 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),
-                        cashRegisterId, cashRegisterQrCodeId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, cashRegisterQrCodeId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<CashRegisterQrCode>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a collection of QR code information from a given CashRegister
         /// </summary>
-        public static BunqResponse<List<CashRegisterQrCode>> List(int cashRegisterId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<CashRegisterQrCode>> List(int cashRegisterId, int? 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), cashRegisterId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), urlParams, customHeaders);
+    
             return FromJsonList<CashRegisterQrCode>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -165,40 +151,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.CashRegister != null)
             {
                 return false;
             }
-
+    
             if (this.TabObject != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CashRegisterQrCode CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CashRegisterQrCode>(json);
+            return BunqModel.CreateFromJsonString<CashRegisterQrCode>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CashRegisterQrCodeContent.cs b/BunqSdk/Model/Generated/Endpoint/CashRegisterQrCodeContent.cs
index b28da5a..e0e5e7b 100644
--- a/BunqSdk/Model/Generated/Endpoint/CashRegisterQrCodeContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CashRegisterQrCodeContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -12,45 +17,39 @@ public class CashRegisterQrCodeContent : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/qr-code/{3}/content";
-
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register/{2}/qr-code/{3}/content";
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CashRegisterQrCodeContent";
-
+    
         /// <summary>
         /// Show the raw contents of a QR code
         /// </summary>
-        public static BunqResponse<byte[]> List(int cashRegisterId, int qrCodeId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(int cashRegisterId, int qrCodeId, int? 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_LISTING, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, qrCodeId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, qrCodeId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CashRegisterQrCodeContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CashRegisterQrCodeContent>(json);
+            return BunqModel.CreateFromJsonString<CashRegisterQrCodeContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CertificatePinned.cs b/BunqSdk/Model/Generated/Endpoint/CertificatePinned.cs
index 218ce07..e77f175 100644
--- a/BunqSdk/Model/Generated/Endpoint/CertificatePinned.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CertificatePinned.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,101 +23,92 @@ public class CertificatePinned : BunqModel
         protected const string ENDPOINT_URL_DELETE = "user/{0}/certificate-pinned/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/certificate-pinned";
         protected const string ENDPOINT_URL_READ = "user/{0}/certificate-pinned/{1}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_CERTIFICATE_CHAIN = "certificate_chain";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CertificatePinned";
-
+    
         /// <summary>
         /// The certificate chain in .PEM format. Certificates are glued with newline characters.
         /// </summary>
         [JsonProperty(PropertyName = "certificate_chain")]
         public string CertificateChain { get; set; }
-
+    
         /// <summary>
         /// The id generated for the pinned certificate chain.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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<Certificate> certificateChain,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(List<Certificate> certificateChain, 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_CERTIFICATE_CHAIN, certificateChain},
-            };
-
+    {
+    {FIELD_CERTIFICATE_CHAIN, certificateChain},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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(int certificatePinnedId, 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(), certificatePinnedId),
-                    customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), certificatePinnedId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// List all the pinned certificate chain for the given user.
         /// </summary>
-        public static BunqResponse<List<CertificatePinned>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<CertificatePinned>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<CertificatePinned>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get the pinned certificate chain with the specified ID.
         /// </summary>
-        public static BunqResponse<CertificatePinned> Get(int certificatePinnedId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<CertificatePinned> Get(int certificatePinnedId, 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(), certificatePinnedId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), certificatePinnedId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<CertificatePinned>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -124,20 +117,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Id != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CertificatePinned CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CertificatePinned>(json);
+            return BunqModel.CreateFromJsonString<CertificatePinned>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ChatMessage.cs b/BunqSdk/Model/Generated/Endpoint/ChatMessage.cs
index f03ed98..b08c505 100644
--- a/BunqSdk/Model/Generated/Endpoint/ChatMessage.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ChatMessage.cs
@@ -1,4 +1,6 @@
 using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -7,18 +9,19 @@ namespace Bunq.Sdk.Model.Generated.Endpoint
     /// </summary>
     public class ChatMessage : BunqModel
     {
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ChatMessage CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ChatMessage>(json);
+            return BunqModel.CreateFromJsonString<ChatMessage>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Company.cs b/BunqSdk/Model/Generated/Endpoint/Company.cs
index 62968d7..4281a3f 100644
--- a/BunqSdk/Model/Generated/Endpoint/Company.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Company.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +22,7 @@ public class Company : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/company/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/company";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/company/{1}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -33,72 +35,72 @@ public class Company : BunqModel
         public const string FIELD_LEGAL_FORM = "legal_form";
         public const string FIELD_SUBSCRIPTION_TYPE = "subscription_type";
         public const string FIELD_AVATAR_UUID = "avatar_uuid";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "UserCompany";
-
+    
         /// <summary>
         /// The company name.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
+    
         /// <summary>
         /// The company's main address.
         /// </summary>
         [JsonProperty(PropertyName = "address_main")]
         public Address AddressMain { get; set; }
-
+    
         /// <summary>
         /// The company's postal address.
         /// </summary>
         [JsonProperty(PropertyName = "address_postal")]
         public Address AddressPostal { get; set; }
-
+    
         /// <summary>
         /// The country where the company is registered.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// The names and birth dates of the company's ultimate beneficiary owners. Minimum zero, maximum four.
         /// </summary>
         [JsonProperty(PropertyName = "ubo")]
         public List<Ubo> Ubo { get; set; }
-
+    
         /// <summary>
         /// The company's chamber of commerce number.
         /// </summary>
         [JsonProperty(PropertyName = "chamber_of_commerce_number")]
         public string ChamberOfCommerceNumber { get; set; }
-
+    
         /// <summary>
         /// The company's legal form.
         /// </summary>
         [JsonProperty(PropertyName = "legal_form")]
         public string LegalForm { get; set; }
-
+    
         /// <summary>
         /// The subscription type for the company.
         /// </summary>
         [JsonProperty(PropertyName = "subscription_type")]
         public string SubscriptionType { get; set; }
-
+    
         /// <summary>
         /// The public UUID of the company's avatar.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_uuid")]
         public string AvatarUuid { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "UserCompany")]
         public UserCompany UserCompany { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="name">The company name.</param>
@@ -110,85 +112,77 @@ public class Company : BunqModel
         /// <param name="chamberOfCommerceNumber">The company's chamber of commerce number.</param>
         /// <param name="subscriptionType">The subscription type for the company.</param>
         /// <param name="avatarUuid">The public UUID of the company's avatar.</param>
-        public static BunqResponse<int> Create(string name, Address addressMain, Address addressPostal, string country,
-            string legalForm, List<Ubo> ubo = null, string chamberOfCommerceNumber = null,
-            string subscriptionType = null, string avatarUuid = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(string name, Address addressMain, Address addressPostal, string country, string legalForm, List<Ubo> ubo = null, string chamberOfCommerceNumber = null, string subscriptionType = null, string avatarUuid = 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_NAME, name},
-                {FIELD_ADDRESS_MAIN, addressMain},
-                {FIELD_ADDRESS_POSTAL, addressPostal},
-                {FIELD_COUNTRY, country},
-                {FIELD_UBO, ubo},
-                {FIELD_CHAMBER_OF_COMMERCE_NUMBER, chamberOfCommerceNumber},
-                {FIELD_LEGAL_FORM, legalForm},
-                {FIELD_SUBSCRIPTION_TYPE, subscriptionType},
-                {FIELD_AVATAR_UUID, avatarUuid},
-            };
-
+    {
+    {FIELD_NAME, name},
+    {FIELD_ADDRESS_MAIN, addressMain},
+    {FIELD_ADDRESS_POSTAL, addressPostal},
+    {FIELD_COUNTRY, country},
+    {FIELD_UBO, ubo},
+    {FIELD_CHAMBER_OF_COMMERCE_NUMBER, chamberOfCommerceNumber},
+    {FIELD_LEGAL_FORM, legalForm},
+    {FIELD_SUBSCRIPTION_TYPE, subscriptionType},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqResponse<Company> Get(int companyId, 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(), companyId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), companyId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Company>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<Company>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Company>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<Company>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <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<int> Update(int companyId, string avatarUuid = 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_AVATAR_UUID, avatarUuid},
-            };
-
+    {
+    {FIELD_AVATAR_UUID, avatarUuid},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), companyId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), companyId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -197,15 +191,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Company CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Company>(json);
+            return BunqModel.CreateFromJsonString<Company>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ConfirmationOfFunds.cs b/BunqSdk/Model/Generated/Endpoint/ConfirmationOfFunds.cs
index 2295e81..110c937 100644
--- a/BunqSdk/Model/Generated/Endpoint/ConfirmationOfFunds.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ConfirmationOfFunds.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -17,62 +19,60 @@ public class ConfirmationOfFunds : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/confirmation-of-funds";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_POINTER_IBAN = "pointer_iban";
         public const string FIELD_AMOUNT = "amount";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "ConfirmationOfFunds";
-
+    
         /// <summary>
         /// The pointer (IBAN) of the account we're querying.
         /// </summary>
         [JsonProperty(PropertyName = "pointer_iban")]
         public MonetaryAccountReference PointerIban { get; set; }
-
+    
         /// <summary>
         /// The amount we want to check for.
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { get; set; }
-
+    
         /// <summary>
         /// Whether the account has sufficient funds.
         /// </summary>
         [JsonProperty(PropertyName = "has_sufficient_funds")]
         public bool? HasSufficientFunds { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="pointerIban">The pointer (IBAN) of the account we're querying.</param>
         /// <param name="amount">The amount we want to check for.</param>
-        public static BunqResponse<ConfirmationOfFunds> Create(Pointer pointerIban, Amount amount,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ConfirmationOfFunds> Create(Pointer pointerIban, Amount amount, 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_POINTER_IBAN, pointerIban},
-                {FIELD_AMOUNT, amount},
-            };
-
+    {
+    {FIELD_POINTER_IBAN, pointerIban},
+    {FIELD_AMOUNT, amount},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return FromJson<ConfirmationOfFunds>(responseRaw, OBJECT_TYPE_POST);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -81,15 +81,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ConfirmationOfFunds CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ConfirmationOfFunds>(json);
+            return BunqModel.CreateFromJsonString<ConfirmationOfFunds>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Customer.cs b/BunqSdk/Model/Generated/Endpoint/Customer.cs
index bf844f9..596758f 100644
--- a/BunqSdk/Model/Generated/Endpoint/Customer.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Customer.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -13,39 +14,40 @@ public class Customer : BunqModel
         /// </summary>
         public const string FIELD_BILLING_ACCOUNT_ID = "billing_account_id";
         public const string FIELD_INVOICE_NOTIFICATION_PREFERENCE = "invoice_notification_preference";
-
-
+    
+    
         /// <summary>
         /// The primary billing account account's id.
         /// </summary>
         [JsonProperty(PropertyName = "billing_account_id")]
         public string BillingAccountId { get; set; }
-
+    
         /// <summary>
         /// The preferred notification type for invoices.
         /// </summary>
         [JsonProperty(PropertyName = "invoice_notification_preference")]
         public string InvoiceNotificationPreference { get; set; }
-
+    
         /// <summary>
         /// The id of the customer.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the customer object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the customer object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -54,35 +56,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.BillingAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.InvoiceNotificationPreference != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Customer CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Customer>(json);
+            return BunqModel.CreateFromJsonString<Customer>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/CustomerLimit.cs b/BunqSdk/Model/Generated/Endpoint/CustomerLimit.cs
index 6e01ecd..f0ca7e1 100644
--- a/BunqSdk/Model/Generated/Endpoint/CustomerLimit.cs
+++ b/BunqSdk/Model/Generated/Endpoint/CustomerLimit.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,84 +19,82 @@ public class CustomerLimit : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/limit";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CustomerLimit";
-
+    
         /// <summary>
         /// The limit of monetary accounts.
         /// </summary>
         [JsonProperty(PropertyName = "limit_monetary_account")]
         public int? 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; }
-
+    
         /// <summary>
         /// The limit of Maestro cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_debit_maestro")]
         public int? LimitCardDebitMaestro { get; set; }
-
+    
         /// <summary>
         /// The limit of MasterCard cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_debit_mastercard")]
         public int? 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; }
-
+    
         /// <summary>
         /// The limit of wildcards, e.g. Maestro or MasterCard cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_wildcard")]
         public int? LimitCardWildcard { get; set; }
-
+    
         /// <summary>
         /// The limit of free replacement cards.
         /// </summary>
         [JsonProperty(PropertyName = "limit_card_replacement")]
         public int? LimitCardReplacement { get; set; }
-
+    
         /// <summary>
         /// The maximum amount a user is allowed to spend in a month.
         /// </summary>
         [JsonProperty(PropertyName = "limit_amount_monthly")]
         public Amount LimitAmountMonthly { get; set; }
-
+    
         /// <summary>
         /// The amount the user has spent in the last month.
         /// </summary>
         [JsonProperty(PropertyName = "spent_amount_monthly")]
         public Amount SpentAmountMonthly { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get all limits for the authenticated user.
         /// </summary>
-        public static BunqResponse<List<CustomerLimit>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<CustomerLimit>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<CustomerLimit>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -101,55 +103,55 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.LimitMonetaryAccountRemaining != null)
             {
                 return false;
             }
-
+    
             if (this.LimitCardDebitMaestro != null)
             {
                 return false;
             }
-
+    
             if (this.LimitCardDebitMastercard != null)
             {
                 return false;
             }
-
+    
             if (this.LimitCardDebitWildcard != null)
             {
                 return false;
             }
-
+    
             if (this.LimitCardWildcard != null)
             {
                 return false;
             }
-
+    
             if (this.LimitCardReplacement != null)
             {
                 return false;
             }
-
+    
             if (this.LimitAmountMonthly != null)
             {
                 return false;
             }
-
+    
             if (this.SpentAmountMonthly != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CustomerLimit CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CustomerLimit>(json);
+            return BunqModel.CreateFromJsonString<CustomerLimit>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Device.cs b/BunqSdk/Model/Generated/Endpoint/Device.cs
index c9c3255..1848f7e 100644
--- a/BunqSdk/Model/Generated/Endpoint/Device.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Device.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,53 +19,51 @@ public class Device : BunqModel, IAnchorObjectInterface
         /// 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_READ = "device/{0}";
         protected const string ENDPOINT_URL_LISTING = "device";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Device";
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "DeviceServer")]
         public DeviceServer DeviceServer { get; set; }
-
+    
         /// <summary>
         /// Get a single Device. A Device is either a DevicePhone or a DeviceServer.
         /// </summary>
         public static BunqResponse<Device> Get(int deviceId, 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, deviceId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, deviceId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Device>(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a collection of Devices. A Device is either a DevicePhone or a DeviceServer.
         /// </summary>
-        public static BunqResponse<List<Device>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Device>> List( 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(ENDPOINT_URL_LISTING, urlParams, customHeaders);
-
+    
             return FromJsonList<Device>(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -70,10 +72,10 @@ public BunqModel GetReferencedObject()
             {
                 return this.DeviceServer;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -82,15 +84,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Device CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Device>(json);
+            return BunqModel.CreateFromJsonString<Device>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/DeviceServer.cs b/BunqSdk/Model/Generated/Endpoint/DeviceServer.cs
index af4ff19..f0a12e6 100644
--- a/BunqSdk/Model/Generated/Endpoint/DeviceServer.cs
+++ b/BunqSdk/Model/Generated/Endpoint/DeviceServer.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,69 +21,69 @@ public class DeviceServer : BunqModel
         protected const string ENDPOINT_URL_CREATE = "device-server";
         protected const string ENDPOINT_URL_READ = "device-server/{0}";
         protected const string ENDPOINT_URL_LISTING = "device-server";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_DESCRIPTION = "description";
         public const string FIELD_SECRET = "secret";
         public const string FIELD_PERMITTED_IPS = "permitted_ips";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "DeviceServer";
-
+    
         /// <summary>
         /// The description of the DeviceServer.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The API key. You can request an API key in the bunq app.
         /// </summary>
         [JsonProperty(PropertyName = "secret")]
         public string Secret { get; set; }
-
+    
         /// <summary>
         /// An array of IPs (v4 or v6) this DeviceServer will be able to do calls from. These will be linked to the API
         /// key.
         /// </summary>
         [JsonProperty(PropertyName = "permitted_ips")]
         public List<string> PermittedIps { get; set; }
-
+    
         /// <summary>
         /// The id of the DeviceServer as created on the server.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the DeviceServer's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the DeviceServer's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The ip address which was used to create the DeviceServer.
         /// </summary>
         [JsonProperty(PropertyName = "ip")]
         public string Ip { get; set; }
-
+    
         /// <summary>
         /// The status of the DeviceServer. Can be ACTIVE, BLOCKED, NEEDS_CONFIRMATION or OBSOLETE.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new DeviceServer providing the installation token in the header and signing the request with the
         /// private part of the key you used to create the installation. The API Key that you are using will be bound to
@@ -93,57 +95,53 @@ public class DeviceServer : 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<int> Create(string description, string secret, List<string> permittedIps = 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_SECRET, secret},
-                {FIELD_PERMITTED_IPS, permittedIps},
-            };
-
+    {
+    {FIELD_DESCRIPTION, description},
+    {FIELD_SECRET, secret},
+    {FIELD_PERMITTED_IPS, permittedIps},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
             var responseRaw = apiClient.Post(ENDPOINT_URL_CREATE, requestBytes, customHeaders);
-
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get one of your DeviceServers.
         /// </summary>
-        public static BunqResponse<DeviceServer> Get(int deviceServerId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<DeviceServer> Get(int deviceServerId, 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, deviceServerId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, deviceServerId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<DeviceServer>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a collection of all the DeviceServers you have created.
         /// </summary>
-        public static BunqResponse<List<DeviceServer>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<DeviceServer>> List( 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(ENDPOINT_URL_LISTING, urlParams, customHeaders);
-
+    
             return FromJsonList<DeviceServer>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -152,40 +150,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Ip != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static DeviceServer CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<DeviceServer>(json);
+            return BunqModel.CreateFromJsonString<DeviceServer>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/DraftPayment.cs b/BunqSdk/Model/Generated/Endpoint/DraftPayment.cs
index 767a8cc..9b92561 100644
--- a/BunqSdk/Model/Generated/Endpoint/DraftPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/DraftPayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,7 +23,7 @@ public class DraftPayment : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/draft-payment/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/draft-payment";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/draft-payment/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -30,87 +32,87 @@ public class DraftPayment : 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";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "DraftPayment";
-
+    
         /// <summary>
         /// The status of the DraftPayment.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The entries in the DraftPayment.
         /// </summary>
         [JsonProperty(PropertyName = "entries")]
         public List<DraftPaymentEntry> Entries { get; set; }
-
+    
         /// <summary>
         /// The last updated_timestamp that you received for this DraftPayment. This needs to be provided to prevent
         /// race conditions.
         /// </summary>
         [JsonProperty(PropertyName = "previous_updated_timestamp")]
         public string PreviousUpdatedTimestamp { get; set; }
-
+    
         /// <summary>
         /// The number of accepts that are required for the draft payment to receive status ACCEPTED. Currently only 1
         /// is valid.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_required_accepts")]
         public int? NumberOfRequiredAccepts { get; set; }
-
+    
         /// <summary>
         /// The schedule details.
         /// </summary>
         [JsonProperty(PropertyName = "schedule")]
         public Schedule Schedule { get; set; }
-
+    
         /// <summary>
         /// The id of the created DrafPayment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The id of the MonetaryAccount the DraftPayment applies to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The label of the User who created the DraftPayment.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_created")]
         public LabelUser UserAliasCreated { get; set; }
-
+    
         /// <summary>
         /// All responses to this draft payment.
         /// </summary>
         [JsonProperty(PropertyName = "responses")]
         public List<DraftPaymentResponse> Responses { get; set; }
-
+    
         /// <summary>
         /// The type of the DraftPayment.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The Payment or PaymentBatch. This will only be present after the DraftPayment has been accepted.
         /// </summary>
         [JsonProperty(PropertyName = "object")]
         public DraftPaymentAnchorObject Object { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
         [JsonProperty(PropertyName = "request_reference_split_the_bill")]
         public List<RequestInquiryReference> RequestReferenceSplitTheBill { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new DraftPayment.
         /// </summary>
@@ -119,100 +121,80 @@ public class DraftPayment : 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<DraftPaymentEntry> entries, int? numberOfRequiredAccepts,
-            int? monetaryAccountId = null, string status = null, string previousUpdatedTimestamp = null,
-            Schedule schedule = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(List<DraftPaymentEntry> entries, int? numberOfRequiredAccepts, int? monetaryAccountId= null, string status = null, string previousUpdatedTimestamp = null, Schedule schedule = 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},
-                {FIELD_ENTRIES, entries},
-                {FIELD_PREVIOUS_UPDATED_TIMESTAMP, previousUpdatedTimestamp},
-                {FIELD_NUMBER_OF_REQUIRED_ACCEPTS, numberOfRequiredAccepts},
-                {FIELD_SCHEDULE, schedule},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    {FIELD_ENTRIES, entries},
+    {FIELD_PREVIOUS_UPDATED_TIMESTAMP, previousUpdatedTimestamp},
+    {FIELD_NUMBER_OF_REQUIRED_ACCEPTS, numberOfRequiredAccepts},
+    {FIELD_SCHEDULE, schedule},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Update a DraftPayment.
         /// </summary>
         /// <param name="status">The status of the DraftPayment.</param>
-        /// <param name="entries">The list of entries in the DraftPayment. Each entry will result in a payment when the DraftPayment is accepted.</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,
-            List<DraftPaymentEntry> entries = null, string previousUpdatedTimestamp = null, Schedule schedule = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int draftPaymentId, int? monetaryAccountId= null, string status = null, string previousUpdatedTimestamp = null, Schedule schedule = 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},
-                {FIELD_ENTRIES, entries},
-                {FIELD_PREVIOUS_UPDATED_TIMESTAMP, previousUpdatedTimestamp},
-                {FIELD_SCHEDULE, schedule},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    {FIELD_PREVIOUS_UPDATED_TIMESTAMP, previousUpdatedTimestamp},
+    {FIELD_SCHEDULE, schedule},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        draftPaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a listing of all DraftPayments from a given MonetaryAccount.
         /// </summary>
-        public static BunqResponse<List<DraftPayment>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<DraftPayment>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<DraftPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a specific DraftPayment.
         /// </summary>
-        public static BunqResponse<DraftPayment> Get(int draftPaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<DraftPayment> Get(int draftPaymentId, int? 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),
-                        draftPaymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<DraftPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -221,60 +203,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.UserAliasCreated != null)
             {
                 return false;
             }
-
+    
             if (this.Responses != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.Entries != null)
             {
                 return false;
             }
-
+    
             if (this.Object != null)
             {
                 return false;
             }
-
+    
             if (this.RequestReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             if (this.Schedule != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static DraftPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<DraftPayment>(json);
+            return BunqModel.CreateFromJsonString<DraftPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/DraftShareInviteBank.cs b/BunqSdk/Model/Generated/Endpoint/DraftShareInviteBank.cs
index 7b46457..efbbf7f 100644
--- a/BunqSdk/Model/Generated/Endpoint/DraftShareInviteBank.cs
+++ b/BunqSdk/Model/Generated/Endpoint/DraftShareInviteBank.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -22,148 +24,138 @@ public class DraftShareInviteBank : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/draft-share-invite-bank/{1}";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/draft-share-invite-bank/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/draft-share-invite-bank";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_STATUS = "status";
         public const string FIELD_EXPIRATION = "expiration";
         public const string FIELD_DRAFT_SHARE_SETTINGS = "draft_share_settings";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "DraftShareInviteBank";
-
+    
         /// <summary>
         /// The status of the draft share invite. Can be USED, CANCELLED and PENDING.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The moment when this draft share invite expires.
         /// </summary>
         [JsonProperty(PropertyName = "expiration")]
         public string Expiration { get; set; }
-
+    
         /// <summary>
         /// The draft share invite details.
         /// </summary>
         [JsonProperty(PropertyName = "draft_share_settings")]
         public DraftShareInviteEntry DraftShareSettings { get; set; }
-
+    
         /// <summary>
         /// The user who created the draft share invite.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_created")]
         public LabelUser UserAliasCreated { get; set; }
-
+    
         /// <summary>
         /// The id of the share invite bank response this draft share belongs to.
         /// </summary>
         [JsonProperty(PropertyName = "share_invite_bank_response_id")]
         public int? ShareInviteBankResponseId { get; set; }
-
+    
         /// <summary>
         /// The URL redirecting user to the draft share invite in the app. Only works on mobile devices.
         /// </summary>
         [JsonProperty(PropertyName = "draft_share_url")]
         public string DraftShareUrl { get; set; }
-
+    
         /// <summary>
         /// The id of the newly created draft share invite.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="expiration">The moment when this draft share invite expires.</param>
         /// <param name="draftShareSettings">The draft share invite details.</param>
         /// <param name="status">The status of the draft share invite. Can be CANCELLED (the user cancels the draft share before it's used).</param>
-        public static BunqResponse<int> Create(string expiration, DraftShareInviteEntry draftShareSettings,
-            string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(string expiration, DraftShareInviteEntry draftShareSettings, 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},
-                {FIELD_EXPIRATION, expiration},
-                {FIELD_DRAFT_SHARE_SETTINGS, draftShareSettings},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    {FIELD_EXPIRATION, expiration},
+    {FIELD_DRAFT_SHARE_SETTINGS, draftShareSettings},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get the details of a specific draft of a share invite.
         /// </summary>
-        public static BunqResponse<DraftShareInviteBank> Get(int draftShareInviteBankId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<DraftShareInviteBank> Get(int draftShareInviteBankId, 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(), draftShareInviteBankId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), draftShareInviteBankId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<DraftShareInviteBank>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Update a draft share invite. When sending status CANCELLED it is possible to cancel the draft share invite.
         /// </summary>
         /// <param name="status">The status of the draft share invite. Can be CANCELLED (the user cancels the draft share before it's used).</param>
         /// <param name="expiration">The moment when this draft share invite expires.</param>
         /// <param name="draftShareSettings">The draft share invite details.</param>
-        public static BunqResponse<int> Update(int draftShareInviteBankId, string status = null,
-            string expiration = null, DraftShareInviteEntry draftShareSettings = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int draftShareInviteBankId, string status = null, string expiration = null, DraftShareInviteEntry draftShareSettings = 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},
-                {FIELD_EXPIRATION, expiration},
-                {FIELD_DRAFT_SHARE_SETTINGS, draftShareSettings},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    {FIELD_EXPIRATION, expiration},
+    {FIELD_DRAFT_SHARE_SETTINGS, draftShareSettings},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), draftShareInviteBankId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), draftShareInviteBankId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<DraftShareInviteBank>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<DraftShareInviteBank>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<DraftShareInviteBank>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -172,45 +164,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.Expiration != null)
             {
                 return false;
             }
-
+    
             if (this.ShareInviteBankResponseId != null)
             {
                 return false;
             }
-
+    
             if (this.DraftShareUrl != null)
             {
                 return false;
             }
-
+    
             if (this.DraftShareSettings != null)
             {
                 return false;
             }
-
+    
             if (this.Id != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static DraftShareInviteBank CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<DraftShareInviteBank>(json);
+            return BunqModel.CreateFromJsonString<DraftShareInviteBank>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/DraftShareInviteBankQrCodeContent.cs b/BunqSdk/Model/Generated/Endpoint/DraftShareInviteBankQrCodeContent.cs
index 47b4714..eb82868 100644
--- a/BunqSdk/Model/Generated/Endpoint/DraftShareInviteBankQrCodeContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/DraftShareInviteBankQrCodeContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,42 +19,39 @@ public class DraftShareInviteBankQrCodeContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/draft-share-invite-bank/{1}/qr-code-content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "DraftShareInviteBankQrCodeContent";
-
+    
         /// <summary>
         /// Returns the raw content of the QR code that links to this draft share invite. The raw content is the binary
         /// representation of a file, without any JSON wrapping.
         /// </summary>
-        public static BunqResponse<byte[]> List(int draftShareInviteBankId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(int draftShareInviteBankId, 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_LISTING, DetermineUserId(), draftShareInviteBankId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), draftShareInviteBankId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static DraftShareInviteBankQrCodeContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<DraftShareInviteBankQrCodeContent>(json);
+            return BunqModel.CreateFromJsonString<DraftShareInviteBankQrCodeContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Event.cs b/BunqSdk/Model/Generated/Endpoint/Event.cs
index 9e3c326..bce07bf 100644
--- a/BunqSdk/Model/Generated/Endpoint/Event.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Event.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -18,76 +22,87 @@ public class Event : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/event/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/event";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Event";
-
+    
         /// <summary>
         /// The id of the event.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the event's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the event's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The performed action. Can be: CREATE or UPDATE.
         /// </summary>
         [JsonProperty(PropertyName = "action")]
         public string Action { get; set; }
-
+    
         /// <summary>
         /// The id of the user the event applied to (if it was a user event).
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
         public string UserId { get; set; }
-
+    
         /// <summary>
         /// The id of the monetary account the event applied to (if it was a monetary account event).
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public string MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The details of the external object the event was created for.
         /// </summary>
         [JsonProperty(PropertyName = "object")]
         public EventObject Object { get; set; }
-
+    
         /// <summary>
         /// The event status. Can be: FINALIZED or AWAITING_REPLY. An example of FINALIZED event is a payment received
         /// event, while an AWAITING_REPLY event is a request received event.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
-
+    
+        /// <summary>
+        /// Fields of the external model which we have stored so we know what they were at the time of the event.
+        /// </summary>
+        [JsonProperty(PropertyName = "object_data_at_event")]
+        public BunqModel ObjectDataAtEvent { get; set; }
+    
+        /// <summary>
+        /// Indicator whether this is the latest event for the object.
+        /// </summary>
+        [JsonProperty(PropertyName = "is_event_latest_for_object")]
+        public bool? IsEventLatestForObject { get; set; }
+    
+    
         /// <summary>
         /// Get a specific event for a given user.
         /// </summary>
         public static BunqResponse<Event> Get(int eventId, 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(), eventId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), eventId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Event>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a collection of events for a given user. You can add query the parameters monetary_account_id, status
         /// and/or display_user_event to filter the response. When monetary_account_id={id,id} is provided only events
@@ -97,20 +112,18 @@ public static BunqResponse<Event> Get(int eventId, IDictionary<string, string> c
         /// provided user events are displayed. User events are events that are not related to a monetary account (for
         /// example: connect invites).
         /// </summary>
-        public static BunqResponse<List<Event>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Event>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<Event>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -119,50 +132,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Action != null)
             {
                 return false;
             }
-
+    
             if (this.UserId != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.Object != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
+            if (this.ObjectDataAtEvent != null)
+            {
+                return false;
+            }
+    
+            if (this.IsEventLatestForObject != null)
+            {
+                return false;
+            }
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Event CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Event>(json);
+            return BunqModel.CreateFromJsonString<Event>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverview.cs b/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverview.cs
index 79a93cb..f6c0e8b 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverview.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverview.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,48 +23,48 @@ public class ExportAnnualOverview : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/export-annual-overview/{1}";
         protected const string ENDPOINT_URL_DELETE = "user/{0}/export-annual-overview/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/export-annual-overview";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_YEAR = "year";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ExportAnnualOverview";
-
+    
         /// <summary>
         /// The year for which the overview is.
         /// </summary>
         [JsonProperty(PropertyName = "year")]
         public int? Year { get; set; }
-
+    
         /// <summary>
         /// The id of the annual overview as created on the server.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the annual overview 's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the annual overview 's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The user to which this annual overview belongs.
         /// </summary>
         [JsonProperty(PropertyName = "alias_user")]
         public LabelUser AliasUser { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new annual overview for a specific year. An overview can be generated only for a past year.
         /// </summary>
@@ -70,68 +72,60 @@ public class ExportAnnualOverview : BunqModel
         public static BunqResponse<int> Create(int? year, 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_YEAR, year},
-            };
-
+    {
+    {FIELD_YEAR, year},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get an annual overview for a user by its id.
         /// </summary>
-        public static BunqResponse<ExportAnnualOverview> Get(int exportAnnualOverviewId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportAnnualOverview> Get(int exportAnnualOverviewId, 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(), exportAnnualOverviewId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), exportAnnualOverviewId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<ExportAnnualOverview>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int exportAnnualOverviewId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int exportAnnualOverviewId, 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(), exportAnnualOverviewId),
-                    customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), exportAnnualOverviewId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// List all the annual overviews for a user.
         /// </summary>
-        public static BunqResponse<List<ExportAnnualOverview>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ExportAnnualOverview>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<ExportAnnualOverview>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -140,35 +134,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Year != null)
             {
                 return false;
             }
-
+    
             if (this.AliasUser != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ExportAnnualOverview CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ExportAnnualOverview>(json);
+            return BunqModel.CreateFromJsonString<ExportAnnualOverview>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewContent.cs b/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewContent.cs
index db7b7af..b9abbb2 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportAnnualOverviewContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,41 +19,38 @@ public class ExportAnnualOverviewContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/export-annual-overview/{1}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ExportAnnualOverviewContent";
-
+    
         /// <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(int exportAnnualOverviewId, 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_LISTING, DetermineUserId(), exportAnnualOverviewId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), exportAnnualOverviewId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ExportAnnualOverviewContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ExportAnnualOverviewContent>(json);
+            return BunqModel.CreateFromJsonString<ExportAnnualOverviewContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportRib.cs b/BunqSdk/Model/Generated/Endpoint/ExportRib.cs
index d1ee772..e58b5bd 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportRib.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportRib.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,106 +21,90 @@ public class ExportRib : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/export-rib/{2}";
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/export-rib/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/export-rib";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ExportRib";
-
+    
         /// <summary>
         /// The id of the rib as created on the server.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the RIB's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the RIB's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new RIB.
         /// </summary>
-        public static BunqResponse<int> Create(int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int? 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.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a RIB for a monetary account by its id.
         /// </summary>
-        public static BunqResponse<ExportRib> Get(int exportRibId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportRib> Get(int exportRibId, int? 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),
-                        exportRibId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), exportRibId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<ExportRib>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int exportRibId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int exportRibId, int? 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),
-                        exportRibId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), exportRibId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// List all the RIBs for a monetary account.
         /// </summary>
-        public static BunqResponse<List<ExportRib>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ExportRib>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<ExportRib>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -127,25 +113,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ExportRib CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ExportRib>(json);
+            return BunqModel.CreateFromJsonString<ExportRib>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportRibContent.cs b/BunqSdk/Model/Generated/Endpoint/ExportRibContent.cs
index ed1eb59..7daf606 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportRibContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportRibContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -13,43 +18,38 @@ public class ExportRibContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/export-rib/{2}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ExportRibContent";
-
+    
         /// <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(int exportRibId, int? 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_LISTING, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId), exportRibId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), exportRibId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ExportRibContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ExportRibContent>(json);
+            return BunqModel.CreateFromJsonString<ExportRibContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatement.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatement.cs
index 304913a..def0866 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatement.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatement.cs
@@ -1,9 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +23,7 @@ public class ExportStatement : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/customer-statement/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/customer-statement";
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/customer-statement/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -29,79 +32,79 @@ public class ExportStatement : BunqModel
         public const string FIELD_DATE_END = "date_end";
         public const string FIELD_REGIONAL_FORMAT = "regional_format";
         public const string FIELD_INCLUDE_ATTACHMENT = "include_attachment";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CustomerStatement";
-
+    
         /// <summary>
         /// The format of statement.
         /// </summary>
         [JsonProperty(PropertyName = "statement_format")]
         public string StatementFormat { get; set; }
-
+    
         /// <summary>
         /// The date from when this statement shows transactions.
         /// </summary>
         [JsonProperty(PropertyName = "date_start")]
         public string DateStart { get; set; }
-
+    
         /// <summary>
         /// The date until which statement shows transactions.
         /// </summary>
         [JsonProperty(PropertyName = "date_end")]
         public string DateEnd { get; set; }
-
+    
         /// <summary>
         /// The regional format of a CSV statement.
         /// </summary>
         [JsonProperty(PropertyName = "regional_format")]
         public string RegionalFormat { get; set; }
-
+    
         /// <summary>
         /// Only for PDF exports. Includes attachments to mutations in the export, such as scanned receipts.
         /// </summary>
         [JsonProperty(PropertyName = "include_attachment")]
         public bool? IncludeAttachment { get; set; }
-
+    
         /// <summary>
         /// The id of the customer statement model.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the statement model's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the statement model's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The status of the export.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// MT940 Statement number. Unique per monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "statement_number")]
         public int? StatementNumber { get; set; }
-
+    
         /// <summary>
         /// The monetary account for which this statement was created.
         /// </summary>
         [JsonProperty(PropertyName = "alias_monetary_account")]
         public MonetaryAccountReference AliasMonetaryAccount { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="statementFormat">The format type of statement. Allowed values: MT940, CSV, PDF.</param>
@@ -109,82 +112,65 @@ public class ExportStatement : 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<int> Create(string statementFormat, string dateStart, string dateEnd, int? monetaryAccountId= null, string regionalFormat = null, bool? includeAttachment = 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_STATEMENT_FORMAT, statementFormat},
-                {FIELD_DATE_START, dateStart},
-                {FIELD_DATE_END, dateEnd},
-                {FIELD_REGIONAL_FORMAT, regionalFormat},
-                {FIELD_INCLUDE_ATTACHMENT, includeAttachment},
-            };
-
+    {
+    {FIELD_STATEMENT_FORMAT, statementFormat},
+    {FIELD_DATE_START, dateStart},
+    {FIELD_DATE_END, dateEnd},
+    {FIELD_REGIONAL_FORMAT, regionalFormat},
+    {FIELD_INCLUDE_ATTACHMENT, includeAttachment},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<ExportStatement> Get(int exportStatementId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportStatement> Get(int exportStatementId, int? 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),
-                        exportStatementId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), exportStatementId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<ExportStatement>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<ExportStatement>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ExportStatement>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<ExportStatement>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int exportStatementId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int exportStatementId, int? 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),
-                        exportStatementId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), exportStatementId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -193,60 +179,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.DateStart != null)
             {
                 return false;
             }
-
+    
             if (this.DateEnd != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.StatementNumber != null)
             {
                 return false;
             }
-
+    
             if (this.StatementFormat != null)
             {
                 return false;
             }
-
+    
             if (this.RegionalFormat != null)
             {
                 return false;
             }
-
+    
             if (this.AliasMonetaryAccount != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ExportStatement CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ExportStatement>(json);
+            return BunqModel.CreateFromJsonString<ExportStatement>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementContent.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementContent.cs
index 8d1b82b..dfd6ed6 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -15,42 +20,37 @@ public class ExportStatementContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/customer-statement/{2}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ExportStatementContent";
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<byte[]> List(int customerStatementId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(int customerStatementId, int? 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_LISTING, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId), customerStatementId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), customerStatementId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ExportStatementContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ExportStatementContent>(json);
+            return BunqModel.CreateFromJsonString<ExportStatementContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementPayment.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementPayment.cs
index 69e3046..61141e1 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementPayment.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -17,76 +19,68 @@ public class ExportStatementPayment : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/event/{2}/statement";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/event/{2}/statement/{3}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ExportStatementPayment";
-
+    
         /// <summary>
         /// The id of the single payment statement model.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the statement model's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the statement model's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The status of the export.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<int> Create(int eventId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int eventId, int? 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.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        eventId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), eventId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<ExportStatementPayment> Get(int eventId, int exportStatementPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ExportStatementPayment> Get(int eventId, int exportStatementPaymentId, int? 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),
-                        eventId, exportStatementPaymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), eventId, exportStatementPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<ExportStatementPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -95,30 +89,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ExportStatementPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ExportStatementPayment>(json);
+            return BunqModel.CreateFromJsonString<ExportStatementPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentContent.cs b/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentContent.cs
index 524d74a..eb5ef8f 100644
--- a/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ExportStatementPaymentContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -13,42 +18,37 @@ public class ExportStatementPaymentContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/event/{2}/statement/{3}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ExportStatementPayment";
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<byte[]> List(int eventId, int statementId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(int eventId, int statementId, int? 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_LISTING, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId), eventId, statementId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), eventId, statementId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ExportStatementPaymentContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ExportStatementPaymentContent>(json);
+            return BunqModel.CreateFromJsonString<ExportStatementPaymentContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/FeatureAnnouncement.cs b/BunqSdk/Model/Generated/Endpoint/FeatureAnnouncement.cs
index 45c3d3c..c76d329 100644
--- a/BunqSdk/Model/Generated/Endpoint/FeatureAnnouncement.cs
+++ b/BunqSdk/Model/Generated/Endpoint/FeatureAnnouncement.cs
@@ -1,7 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -14,46 +19,50 @@ public class FeatureAnnouncement : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/feature-announcement/{1}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "FeatureAnnouncement";
-
+    
         /// <summary>
         /// The Avatar of the event overview.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The event overview title of the feature display
         /// </summary>
         [JsonProperty(PropertyName = "title")]
         public string Title { get; set; }
-
+    
         /// <summary>
         /// The event overview subtitle of the feature display
         /// </summary>
         [JsonProperty(PropertyName = "sub_title")]
         public string SubTitle { get; set; }
-
-
+    
         /// <summary>
+        /// The type of the feature announcement so apps can override with their own stuff if desired
         /// </summary>
-        public static BunqResponse<FeatureAnnouncement> Get(int featureAnnouncementId,
-            IDictionary<string, string> customHeaders = null)
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<FeatureAnnouncement> Get(int featureAnnouncementId, 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(), featureAnnouncementId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), featureAnnouncementId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<FeatureAnnouncement>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -62,25 +71,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Title != null)
             {
                 return false;
             }
-
+    
             if (this.SubTitle != null)
             {
                 return false;
             }
-
+    
+            if (this.Type != null)
+            {
+                return false;
+            }
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static FeatureAnnouncement CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<FeatureAnnouncement>(json);
+            return BunqModel.CreateFromJsonString<FeatureAnnouncement>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/IdealMerchantTransaction.cs b/BunqSdk/Model/Generated/Endpoint/IdealMerchantTransaction.cs
index 2059fb6..1fcea1d 100644
--- a/BunqSdk/Model/Generated/Endpoint/IdealMerchantTransaction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/IdealMerchantTransaction.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,157 +21,145 @@ public class IdealMerchantTransaction : BunqModel
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/ideal-merchant-transaction";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/ideal-merchant-transaction";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_AMOUNT_REQUESTED = "amount_requested";
         public const string FIELD_ISSUER = "issuer";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "IdealMerchantTransaction";
-
+    
         /// <summary>
         /// The requested amount of money to add.
         /// </summary>
         [JsonProperty(PropertyName = "amount_requested")]
         public Amount AmountRequested { get; set; }
-
+    
         /// <summary>
         /// The BIC of the issuer.
         /// </summary>
         [JsonProperty(PropertyName = "issuer")]
         public string Issuer { get; set; }
-
+    
         /// <summary>
         /// The id of the monetary account this ideal merchant transaction links to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The alias of the monetary account to add money to.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The alias of the monetary account the money comes from.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// In case of a successful transaction, the amount of money that will be transferred.
         /// </summary>
         [JsonProperty(PropertyName = "amount_guaranteed")]
         public Amount AmountGuaranteed { get; set; }
-
+    
         /// <summary>
         /// When the transaction will expire.
         /// </summary>
         [JsonProperty(PropertyName = "expiration")]
         public string Expiration { get; set; }
-
+    
         /// <summary>
         /// The Name of the issuer.
         /// </summary>
         [JsonProperty(PropertyName = "issuer_name")]
         public string IssuerName { get; set; }
-
+    
         /// <summary>
         /// The URL to visit to 
         /// </summary>
         [JsonProperty(PropertyName = "issuer_authentication_url")]
         public string IssuerAuthenticationUrl { get; set; }
-
+    
         /// <summary>
         /// The 'purchase ID' of the iDEAL transaction.
         /// </summary>
         [JsonProperty(PropertyName = "purchase_identifier")]
         public string PurchaseIdentifier { get; set; }
-
+    
         /// <summary>
         /// The status of the transaction.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// When the status was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "status_timestamp")]
         public string StatusTimestamp { get; set; }
-
+    
         /// <summary>
         /// The 'transaction ID' of the iDEAL transaction.
         /// </summary>
         [JsonProperty(PropertyName = "transaction_identifier")]
         public string TransactionIdentifier { get; set; }
-
-
+    
+    
         /// <summary>
         /// </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(Amount amountRequested, string issuer, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(Amount amountRequested, string issuer, int? 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>
-            {
-                {FIELD_AMOUNT_REQUESTED, amountRequested},
-                {FIELD_ISSUER, issuer},
-            };
-
+    {
+    {FIELD_AMOUNT_REQUESTED, amountRequested},
+    {FIELD_ISSUER, issuer},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<IdealMerchantTransaction> Get(int idealMerchantTransactionId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<IdealMerchantTransaction> Get(int idealMerchantTransactionId, int? 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),
-                        idealMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<IdealMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<IdealMerchantTransaction>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<IdealMerchantTransaction>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<IdealMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -178,75 +168,75 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.AmountGuaranteed != null)
             {
                 return false;
             }
-
+    
             if (this.AmountRequested != null)
             {
                 return false;
             }
-
+    
             if (this.Expiration != null)
             {
                 return false;
             }
-
+    
             if (this.Issuer != null)
             {
                 return false;
             }
-
+    
             if (this.IssuerName != null)
             {
                 return false;
             }
-
+    
             if (this.IssuerAuthenticationUrl != null)
             {
                 return false;
             }
-
+    
             if (this.PurchaseIdentifier != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.StatusTimestamp != null)
             {
                 return false;
             }
-
+    
             if (this.TransactionIdentifier != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static IdealMerchantTransaction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<IdealMerchantTransaction>(json);
+            return BunqModel.CreateFromJsonString<IdealMerchantTransaction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Insight.cs b/BunqSdk/Model/Generated/Endpoint/Insight.cs
index 0ff0537..fb784cd 100644
--- a/BunqSdk/Model/Generated/Endpoint/Insight.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Insight.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,53 +19,51 @@ public class Insight : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/insights";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "InsightCategory";
-
+    
         /// <summary>
         /// The category.
         /// </summary>
         [JsonProperty(PropertyName = "category")]
         public string Category { get; set; }
-
+    
         /// <summary>
         /// The translated category.
         /// </summary>
         [JsonProperty(PropertyName = "category_translated")]
         public string CategoryTranslated { get; set; }
-
+    
         /// <summary>
         /// The total amount of the transactions in the category.
         /// </summary>
         [JsonProperty(PropertyName = "amount_total")]
         public Amount AmountTotal { get; set; }
-
+    
         /// <summary>
         /// The number of the transactions in the category.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_transactions")]
         public double? NumberOfTransactions { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<Insight>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Insight>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<Insight>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -70,30 +72,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.CategoryTranslated != null)
             {
                 return false;
             }
-
+    
             if (this.AmountTotal != null)
             {
                 return false;
             }
-
+    
             if (this.NumberOfTransactions != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Insight CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Insight>(json);
+            return BunqModel.CreateFromJsonString<Insight>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/InsightBudget.cs b/BunqSdk/Model/Generated/Endpoint/InsightBudget.cs
new file mode 100644
index 0000000..29af233
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/InsightBudget.cs
@@ -0,0 +1,55 @@
+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 get insights budgets between given time range.
+    /// </summary>
+    public class InsightBudget : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/insight-budget";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "InsightBudget";
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<List<InsightBudget>> List( 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()), urlParams, customHeaders);
+    
+            return FromJsonList<InsightBudget>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static InsightBudget CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<InsightBudget>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/InsightEvent.cs b/BunqSdk/Model/Generated/Endpoint/InsightEvent.cs
index 71780da..b9e2223 100644
--- a/BunqSdk/Model/Generated/Endpoint/InsightEvent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InsightEvent.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,78 +19,76 @@ public class InsightEvent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/insights-search";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Event";
-
+    
         /// <summary>
         /// The id of the event.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the event's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the event's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The performed action. Can be: CREATE or UPDATE.
         /// </summary>
         [JsonProperty(PropertyName = "action")]
         public string Action { get; set; }
-
+    
         /// <summary>
         /// The id of the user the event applied to (if it was a user event).
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
         public string UserId { get; set; }
-
+    
         /// <summary>
         /// The id of the monetary account the event applied to (if it was a monetary account event).
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public string MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The details of the external object the event was created for.
         /// </summary>
         [JsonProperty(PropertyName = "object")]
         public EventObject Object { get; set; }
-
+    
         /// <summary>
         /// The event status. Can be: FINALIZED or AWAITING_REPLY. An example of FINALIZED event is a payment received
         /// event, while an AWAITING_REPLY event is a request received event.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<InsightEvent>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<InsightEvent>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<InsightEvent>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -95,50 +97,50 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Action != null)
             {
                 return false;
             }
-
+    
             if (this.UserId != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.Object != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static InsightEvent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<InsightEvent>(json);
+            return BunqModel.CreateFromJsonString<InsightEvent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/InsightPreferenceDate.cs b/BunqSdk/Model/Generated/Endpoint/InsightPreferenceDate.cs
new file mode 100644
index 0000000..d5f9bcc
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/InsightPreferenceDate.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 allow users to set insight/budget preferences.
+    /// </summary>
+    public class InsightPreferenceDate : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/insight-preference-date";
+    
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_DAY_OF_MONTH = "day_of_month";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "InsightPreferenceDate";
+    
+        /// <summary>
+        /// The day of month at which budgeting/insights should start.
+        /// </summary>
+        [JsonProperty(PropertyName = "day_of_month")]
+        public int? DayOfMonth { get; set; }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<List<InsightPreferenceDate>> List( 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()), urlParams, customHeaders);
+    
+            return FromJsonList<InsightPreferenceDate>(responseRaw);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.DayOfMonth != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static InsightPreferenceDate CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<InsightPreferenceDate>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/InstallationServerPublicKey.cs b/BunqSdk/Model/Generated/Endpoint/InstallationServerPublicKey.cs
index ceb14d0..473da4d 100644
--- a/BunqSdk/Model/Generated/Endpoint/InstallationServerPublicKey.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InstallationServerPublicKey.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -15,35 +19,33 @@ public class InstallationServerPublicKey : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "installation/{0}/server-public-key";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ServerPublicKey";
-
+    
         /// <summary>
         /// The server's public key for this Installation.
         /// </summary>
         [JsonProperty(PropertyName = "server_public_key")]
         public string ServerPublicKey { get; set; }
-
+    
         /// <summary>
         /// Show the ServerPublicKey for this Installation.
         /// </summary>
-        public static BunqResponse<List<InstallationServerPublicKey>> List(int installationId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<InstallationServerPublicKey>> List(int 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, installationId), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, installationId), urlParams, customHeaders);
+    
             return FromJsonList<InstallationServerPublicKey>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -52,15 +54,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static InstallationServerPublicKey CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<InstallationServerPublicKey>(json);
+            return BunqModel.CreateFromJsonString<InstallationServerPublicKey>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Invoice.cs b/BunqSdk/Model/Generated/Endpoint/Invoice.cs
index 5b1f89d..7fa2938 100644
--- a/BunqSdk/Model/Generated/Endpoint/Invoice.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Invoice.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,174 +20,166 @@ public class Invoice : BunqModel
         /// </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}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_STATUS = "status";
         public const string FIELD_DESCRIPTION = "description";
         public const string FIELD_EXTERNAL_URL = "external_url";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Invoice";
-
+    
         /// <summary>
         /// The invoice status.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The description provided by the admin.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The external url provided by the admin.
         /// </summary>
         [JsonProperty(PropertyName = "external_url")]
         public string ExternalUrl { get; set; }
-
+    
         /// <summary>
         /// The id of the invoice object.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the invoice object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the invoice object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The invoice date.
         /// </summary>
         [JsonProperty(PropertyName = "invoice_date")]
         public string InvoiceDate { get; set; }
-
+    
         /// <summary>
         /// The invoice number.
         /// </summary>
         [JsonProperty(PropertyName = "invoice_number")]
         public string InvoiceNumber { get; set; }
-
+    
         /// <summary>
         /// The category to display to the user.
         /// </summary>
         [JsonProperty(PropertyName = "category")]
         public string Category { get; set; }
-
+    
         /// <summary>
         /// The invoice item groups.
         /// </summary>
         [JsonProperty(PropertyName = "group")]
         public List<InvoiceItemGroup> Group { get; set; }
-
+    
         /// <summary>
         /// The total discounted item price including VAT.
         /// </summary>
         [JsonProperty(PropertyName = "total_vat_inclusive")]
         public Amount TotalVatInclusive { get; set; }
-
+    
         /// <summary>
         /// The total discounted item price excluding VAT.
         /// </summary>
         [JsonProperty(PropertyName = "total_vat_exclusive")]
         public Amount TotalVatExclusive { get; set; }
-
+    
         /// <summary>
         /// The VAT on the total discounted item price.
         /// </summary>
         [JsonProperty(PropertyName = "total_vat")]
         public Amount TotalVat { get; set; }
-
+    
         /// <summary>
         /// The label that's displayed to the counterparty with the invoice. Includes user.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The customer's address.
         /// </summary>
         [JsonProperty(PropertyName = "address")]
         public Address Address { get; set; }
-
+    
         /// <summary>
         /// The label of the counterparty of the invoice. Includes user.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The company's address.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_address")]
         public Address CounterpartyAddress { get; set; }
-
+    
         /// <summary>
         /// The company's chamber of commerce number.
         /// </summary>
         [JsonProperty(PropertyName = "chamber_of_commerce_number")]
         public string ChamberOfCommerceNumber { get; set; }
-
+    
         /// <summary>
         /// The company's chamber of commerce number.
         /// </summary>
         [JsonProperty(PropertyName = "vat_number")]
         public string VatNumber { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
         [JsonProperty(PropertyName = "request_reference_split_the_bill")]
         public List<RequestInquiryReference> RequestReferenceSplitTheBill { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<Invoice>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Invoice>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<Invoice>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<Invoice> Get(int invoiceId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<Invoice> Get(int invoiceId, int? 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),
-                        invoiceId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), invoiceId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Invoice>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -192,100 +188,100 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.InvoiceDate != null)
             {
                 return false;
             }
-
+    
             if (this.InvoiceNumber != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.Category != null)
             {
                 return false;
             }
-
+    
             if (this.Group != null)
             {
                 return false;
             }
-
+    
             if (this.TotalVatInclusive != null)
             {
                 return false;
             }
-
+    
             if (this.TotalVatExclusive != null)
             {
                 return false;
             }
-
+    
             if (this.TotalVat != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.Address != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAddress != null)
             {
                 return false;
             }
-
+    
             if (this.ChamberOfCommerceNumber != null)
             {
                 return false;
             }
-
+    
             if (this.VatNumber != null)
             {
                 return false;
             }
-
+    
             if (this.RequestReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Invoice CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Invoice>(json);
+            return BunqModel.CreateFromJsonString<Invoice>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/InvoiceByUser.cs b/BunqSdk/Model/Generated/Endpoint/InvoiceByUser.cs
index 8c3eb3b..e138139 100644
--- a/BunqSdk/Model/Generated/Endpoint/InvoiceByUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InvoiceByUser.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,139 +20,135 @@ public class InvoiceByUser : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/invoice";
         protected const string ENDPOINT_URL_READ = "user/{0}/invoice/{1}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Invoice";
-
+    
         /// <summary>
         /// The id of the invoice object.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the invoice object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the invoice object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The invoice date.
         /// </summary>
         [JsonProperty(PropertyName = "invoice_date")]
         public string InvoiceDate { get; set; }
-
+    
         /// <summary>
         /// The invoice number.
         /// </summary>
         [JsonProperty(PropertyName = "invoice_number")]
         public string InvoiceNumber { get; set; }
-
+    
         /// <summary>
         /// The invoice status.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The invoice item groups.
         /// </summary>
         [JsonProperty(PropertyName = "group")]
         public List<InvoiceItemGroup> Group { get; set; }
-
+    
         /// <summary>
         /// The total discounted item price including VAT.
         /// </summary>
         [JsonProperty(PropertyName = "total_vat_inclusive")]
         public Amount TotalVatInclusive { get; set; }
-
+    
         /// <summary>
         /// The total discounted item price excluding VAT.
         /// </summary>
         [JsonProperty(PropertyName = "total_vat_exclusive")]
         public Amount TotalVatExclusive { get; set; }
-
+    
         /// <summary>
         /// The VAT on the total discounted item price.
         /// </summary>
         [JsonProperty(PropertyName = "total_vat")]
         public Amount TotalVat { get; set; }
-
+    
         /// <summary>
         /// The label that's displayed to the counterparty with the invoice. Includes user.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The customer's address.
         /// </summary>
         [JsonProperty(PropertyName = "address")]
         public Address Address { get; set; }
-
+    
         /// <summary>
         /// The label of the counterparty of the invoice. Includes user.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The company's address.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_address")]
         public Address CounterpartyAddress { get; set; }
-
+    
         /// <summary>
         /// The company's chamber of commerce number.
         /// </summary>
         [JsonProperty(PropertyName = "chamber_of_commerce_number")]
         public string ChamberOfCommerceNumber { get; set; }
-
+    
         /// <summary>
         /// The company's chamber of commerce number.
         /// </summary>
         [JsonProperty(PropertyName = "vat_number")]
         public string VatNumber { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<InvoiceByUser>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<InvoiceByUser>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<InvoiceByUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<InvoiceByUser> Get(int invoiceByUserId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<InvoiceByUser> Get(int invoiceByUserId, 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(), invoiceByUserId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), invoiceByUserId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<InvoiceByUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -157,90 +157,90 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.InvoiceDate != null)
             {
                 return false;
             }
-
+    
             if (this.InvoiceNumber != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.Group != null)
             {
                 return false;
             }
-
+    
             if (this.TotalVatInclusive != null)
             {
                 return false;
             }
-
+    
             if (this.TotalVatExclusive != null)
             {
                 return false;
             }
-
+    
             if (this.TotalVat != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.Address != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAddress != null)
             {
                 return false;
             }
-
+    
             if (this.ChamberOfCommerceNumber != null)
             {
                 return false;
             }
-
+    
             if (this.VatNumber != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static InvoiceByUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<InvoiceByUser>(json);
+            return BunqModel.CreateFromJsonString<InvoiceByUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfContent.cs b/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfContent.cs
index a4e0676..0573a37 100644
--- a/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/InvoiceExportPdfContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -13,38 +18,37 @@ public class InvoiceExportPdfContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/invoice/{1}/pdf-content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "InvoiceExportPdfContent";
-
+    
         /// <summary>
         /// </summary>
         public static BunqResponse<byte[]> List(int invoiceId, 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_LISTING, DetermineUserId(), invoiceId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), invoiceId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static InvoiceExportPdfContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<InvoiceExportPdfContent>(json);
+            return BunqModel.CreateFromJsonString<InvoiceExportPdfContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MasterCardAction.cs b/BunqSdk/Model/Generated/Endpoint/MasterCardAction.cs
index 0bbbfc5..b5a7f10 100644
--- a/BunqSdk/Model/Generated/Endpoint/MasterCardAction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MasterCardAction.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,242 +20,259 @@ public class MasterCardAction : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/mastercard-action/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/mastercard-action";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "MasterCardAction";
-
+    
         /// <summary>
         /// The id of the MastercardAction.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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; }
-
+    
         /// <summary>
         /// The id of the card this action links to.
         /// </summary>
         [JsonProperty(PropertyName = "card_id")]
         public int? CardId { get; set; }
-
+    
         /// <summary>
         /// The amount of the transaction in local currency.
         /// </summary>
         [JsonProperty(PropertyName = "amount_local")]
         public Amount AmountLocal { get; set; }
-
+    
         /// <summary>
         /// The amount of the transaction in local currency.
         /// </summary>
         [JsonProperty(PropertyName = "amount_converted")]
         public Amount AmountConverted { get; set; }
-
+    
         /// <summary>
         /// The amount of the transaction in the monetary account's currency.
         /// </summary>
         [JsonProperty(PropertyName = "amount_billing")]
         public Amount AmountBilling { get; set; }
-
+    
         /// <summary>
         /// The original amount in local currency.
         /// </summary>
         [JsonProperty(PropertyName = "amount_original_local")]
         public Amount AmountOriginalLocal { get; set; }
-
+    
         /// <summary>
         /// The original amount in the monetary account's currency.
         /// </summary>
         [JsonProperty(PropertyName = "amount_original_billing")]
         public Amount AmountOriginalBilling { get; set; }
-
+    
         /// <summary>
         /// The fee amount as charged by the merchant, if applicable.
         /// </summary>
         [JsonProperty(PropertyName = "amount_fee")]
         public Amount AmountFee { get; set; }
-
+    
         /// <summary>
         /// The response code by which authorised transaction can be identified as authorised by bunq.
         /// </summary>
         [JsonProperty(PropertyName = "card_authorisation_id_response")]
         public string CardAuthorisationIdResponse { get; set; }
-
+    
         /// <summary>
         /// Why the transaction was denied, if it was denied, or just ALLOWED.
         /// </summary>
         [JsonProperty(PropertyName = "decision")]
         public string Decision { get; set; }
-
+    
         /// <summary>
         /// The payment status of the transaction. For example PAYMENT_SUCCESSFUL, for a successful payment.
         /// </summary>
         [JsonProperty(PropertyName = "payment_status")]
         public string PaymentStatus { get; set; }
-
+    
         /// <summary>
         /// Empty if allowed, otherwise a textual explanation of why it was denied.
         /// </summary>
         [JsonProperty(PropertyName = "decision_description")]
         public string DecisionDescription { get; set; }
-
+    
         /// <summary>
         /// Empty if allowed, otherwise a textual explanation of why it was denied in user's language.
         /// </summary>
         [JsonProperty(PropertyName = "decision_description_translated")]
         public string DecisionDescriptionTranslated { get; set; }
-
+    
+        /// <summary>
+        /// Empty if allowed or if no relevant Together topic exists, otherwise contains the URL for a Together topic
+        /// with more information about the decision.
+        /// </summary>
+        [JsonProperty(PropertyName = "decision_together_url")]
+        public string DecisionTogetherUrl { get; set; }
+    
         /// <summary>
         /// The description for this transaction to display.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The status in the authorisation process.
         /// </summary>
         [JsonProperty(PropertyName = "authorisation_status")]
         public string AuthorisationStatus { get; set; }
-
+    
         /// <summary>
         /// The type of transaction that was delivered using the card.
         /// </summary>
         [JsonProperty(PropertyName = "authorisation_type")]
         public string AuthorisationType { get; set; }
-
+    
         /// <summary>
         /// The type of entry mode the user used. Can be 'ATM', 'ICC', 'MAGNETIC_STRIPE' or 'E_COMMERCE'.
         /// </summary>
         [JsonProperty(PropertyName = "pan_entry_mode_user")]
         public string PanEntryModeUser { get; set; }
-
+    
         /// <summary>
         /// The setlement status in the authorisation process.
         /// </summary>
         [JsonProperty(PropertyName = "settlement_status")]
         public string SettlementStatus { get; set; }
-
+    
         /// <summary>
         /// The clearing status of the authorisation. Can be 'PENDING', 'FIRST_PRESENTMENT_COMPLETE' or
         /// 'REFUND_LENIENCY'.
         /// </summary>
         [JsonProperty(PropertyName = "clearing_status")]
         public string ClearingStatus { get; set; }
-
+    
         /// <summary>
         /// The maturity date.
         /// </summary>
         [JsonProperty(PropertyName = "maturity_date")]
         public string MaturityDate { get; set; }
-
+    
         /// <summary>
         /// The city where the message originates from as announced by the terminal.
         /// </summary>
         [JsonProperty(PropertyName = "city")]
         public string City { get; set; }
-
+    
         /// <summary>
         /// The monetary account label of the account that this action is created for.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The monetary account label of the counterparty.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The label of the card.
         /// </summary>
         [JsonProperty(PropertyName = "label_card")]
         public LabelCard LabelCard { get; set; }
-
+    
         /// <summary>
         /// If this is a tokenisation action, this shows the status of the token.
         /// </summary>
         [JsonProperty(PropertyName = "token_status")]
         public string TokenStatus { get; set; }
-
+    
         /// <summary>
         /// If this is a reservation, the moment the reservation will expire.
         /// </summary>
         [JsonProperty(PropertyName = "reservation_expiry_time")]
         public string ReservationExpiryTime { get; set; }
-
+    
         /// <summary>
         /// The time when the processing of the clearing is expired, refunding the authorisation.
         /// </summary>
         [JsonProperty(PropertyName = "clearing_expiry_time")]
         public string ClearingExpiryTime { get; set; }
-
+    
         /// <summary>
         /// The type of the limit applied to validate if this MasterCardAction was within the spending limits. The
         /// returned string matches the limit types as defined in the card endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "applied_limit")]
         public string AppliedLimit { get; set; }
-
+    
         /// <summary>
         /// The secure code id for this mastercard action or null.
         /// </summary>
         [JsonProperty(PropertyName = "secure_code_id")]
         public int? SecureCodeId { get; set; }
-
+    
         /// <summary>
         /// The ID of the wallet provider as defined by MasterCard. 420 = bunq Android app with Tap&Pay; 103 = Apple
         /// Pay.
         /// </summary>
         [JsonProperty(PropertyName = "wallet_provider_id")]
         public string WalletProviderId { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
         [JsonProperty(PropertyName = "request_reference_split_the_bill")]
         public List<RequestInquiryReference> RequestReferenceSplitTheBill { get; set; }
-
-
+    
+        /// <summary>
+        /// The Card Presence type of the POS.
+        /// </summary>
+        [JsonProperty(PropertyName = "pos_card_presence")]
+        public string PosCardPresence { get; set; }
+    
+        /// <summary>
+        /// The Card Holder Presence type of the POS.
+        /// </summary>
+        [JsonProperty(PropertyName = "pos_card_holder_presence")]
+        public string PosCardHolderPresence { get; set; }
+    
         /// <summary>
+        /// The whitelist id for this action or null.
         /// </summary>
-        public static BunqResponse<MasterCardAction> Get(int masterCardActionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        [JsonProperty(PropertyName = "eligible_whitelist_id")]
+        public int? EligibleWhitelistId { get; set; }
+    
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<MasterCardAction> Get(int masterCardActionId, int? 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),
-                        masterCardActionId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), masterCardActionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<MasterCardAction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<MasterCardAction>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<MasterCardAction>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<MasterCardAction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -260,170 +281,190 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.CardId != null)
             {
                 return false;
             }
-
+    
             if (this.AmountLocal != null)
             {
                 return false;
             }
-
+    
             if (this.AmountConverted != null)
             {
                 return false;
             }
-
+    
             if (this.AmountBilling != null)
             {
                 return false;
             }
-
+    
             if (this.AmountOriginalLocal != null)
             {
                 return false;
             }
-
+    
             if (this.AmountOriginalBilling != null)
             {
                 return false;
             }
-
+    
             if (this.AmountFee != null)
             {
                 return false;
             }
-
+    
             if (this.CardAuthorisationIdResponse != null)
             {
                 return false;
             }
-
+    
             if (this.Decision != null)
             {
                 return false;
             }
-
+    
             if (this.PaymentStatus != null)
             {
                 return false;
             }
-
+    
             if (this.DecisionDescription != null)
             {
                 return false;
             }
-
+    
             if (this.DecisionDescriptionTranslated != null)
             {
                 return false;
             }
-
+    
+            if (this.DecisionTogetherUrl != null)
+            {
+                return false;
+            }
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.AuthorisationStatus != null)
             {
                 return false;
             }
-
+    
             if (this.AuthorisationType != null)
             {
                 return false;
             }
-
+    
             if (this.PanEntryModeUser != null)
             {
                 return false;
             }
-
+    
             if (this.SettlementStatus != null)
             {
                 return false;
             }
-
+    
             if (this.ClearingStatus != null)
             {
                 return false;
             }
-
+    
             if (this.MaturityDate != null)
             {
                 return false;
             }
-
+    
             if (this.City != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.LabelCard != null)
             {
                 return false;
             }
-
+    
             if (this.TokenStatus != null)
             {
                 return false;
             }
-
+    
             if (this.ReservationExpiryTime != null)
             {
                 return false;
             }
-
+    
             if (this.ClearingExpiryTime != null)
             {
                 return false;
             }
-
+    
             if (this.AppliedLimit != null)
             {
                 return false;
             }
-
+    
             if (this.SecureCodeId != null)
             {
                 return false;
             }
-
+    
             if (this.WalletProviderId != null)
             {
                 return false;
             }
-
+    
             if (this.RequestReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
+            if (this.PosCardPresence != null)
+            {
+                return false;
+            }
+    
+            if (this.PosCardHolderPresence != null)
+            {
+                return false;
+            }
+    
+            if (this.EligibleWhitelistId != null)
+            {
+                return false;
+            }
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MasterCardAction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MasterCardAction>(json);
+            return BunqModel.CreateFromJsonString<MasterCardAction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MasterCardActionGreenAggregation.cs b/BunqSdk/Model/Generated/Endpoint/MasterCardActionGreenAggregation.cs
index 79d51ed..2f3f4d8 100644
--- a/BunqSdk/Model/Generated/Endpoint/MasterCardActionGreenAggregation.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MasterCardActionGreenAggregation.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,41 +18,39 @@ public class MasterCardActionGreenAggregation : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/mastercard-action-green-aggregation";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "MasterCardActionGreenAggregation";
-
+    
         /// <summary>
         /// The date of the aggregation.
         /// </summary>
         [JsonProperty(PropertyName = "date")]
         public string Date { get; set; }
-
+    
         /// <summary>
         /// The percentage of card payments that were done with a Green Card.
         /// </summary>
         [JsonProperty(PropertyName = "percentage")]
         public string Percentage { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<MasterCardActionGreenAggregation>> List(
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<MasterCardActionGreenAggregation>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<MasterCardActionGreenAggregation>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -57,20 +59,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Percentage != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MasterCardActionGreenAggregation CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MasterCardActionGreenAggregation>(json);
+            return BunqModel.CreateFromJsonString<MasterCardActionGreenAggregation>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MasterCardPayment.cs b/BunqSdk/Model/Generated/Endpoint/MasterCardPayment.cs
new file mode 100644
index 0000000..8503aa6
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/MasterCardPayment.cs
@@ -0,0 +1,55 @@
+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>
+    /// MasterCard transaction view.
+    /// </summary>
+    public class MasterCardPayment : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/mastercard-action/{2}/payment";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "Payment";
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<List<MasterCardPayment>> List(int mastercardActionId, int? 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), mastercardActionId), urlParams, customHeaders);
+    
+            return FromJsonList<MasterCardPayment>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static MasterCardPayment CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<MasterCardPayment>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccount.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccount.cs
index 5b183e3..831f790 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccount.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccount.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -18,73 +22,67 @@ public class MonetaryAccount : BunqModel, IAnchorObjectInterface
         /// 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_READ = "user/{0}/monetary-account/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "MonetaryAccount";
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "MonetaryAccountBank")]
         public MonetaryAccountBank MonetaryAccountBank { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "MonetaryAccountJoint")]
         public MonetaryAccountJoint MonetaryAccountJoint { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "MonetaryAccountLight")]
         public MonetaryAccountLight MonetaryAccountLight { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "MonetaryAccountSavings")]
         public MonetaryAccountSavings MonetaryAccountSavings { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get a specific MonetaryAccount.
         /// </summary>
-        public static BunqResponse<MonetaryAccount> Get(int monetaryAccountId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccount> Get(int monetaryAccountId, 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)),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<MonetaryAccount>(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a collection of all your MonetaryAccounts.
         /// </summary>
-        public static BunqResponse<List<MonetaryAccount>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<MonetaryAccount>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<MonetaryAccount>(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -93,25 +91,25 @@ public BunqModel GetReferencedObject()
             {
                 return this.MonetaryAccountBank;
             }
-
+    
             if (this.MonetaryAccountJoint != null)
             {
                 return this.MonetaryAccountJoint;
             }
-
+    
             if (this.MonetaryAccountLight != null)
             {
                 return this.MonetaryAccountLight;
             }
-
+    
             if (this.MonetaryAccountSavings != null)
             {
                 return this.MonetaryAccountSavings;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -120,30 +118,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountJoint != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountLight != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountSavings != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccount CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccount>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccount>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBank.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBank.cs
index 39d6188..43674ec 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBank.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountBank.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -24,7 +26,7 @@ public class MonetaryAccountBank : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account-bank/{1}";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account-bank/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account-bank";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -38,43 +40,44 @@ public class MonetaryAccountBank : BunqModel
         public const string FIELD_REASON_DESCRIPTION = "reason_description";
         public const string FIELD_DISPLAY_NAME = "display_name";
         public const string FIELD_SETTING = "setting";
-
+        public const string FIELD_COUNTRY_IBAN = "country_iban";
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "MonetaryAccountBank";
-
+    
         /// <summary>
         /// The currency of the MonetaryAccountBank as an ISO 4217 formatted currency code.
         /// </summary>
         [JsonProperty(PropertyName = "currency")]
         public string Currency { get; set; }
-
+    
         /// <summary>
         /// The description of the MonetaryAccountBank. Defaults to 'bunq account'.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The daily spending limit Amount of the MonetaryAccountBank. Defaults to 1000 EUR. Currency must match the
         /// MonetaryAccountBank's currency. Limited to 10000 EUR.
         /// </summary>
         [JsonProperty(PropertyName = "daily_limit")]
         public Amount DailyLimit { get; set; }
-
+    
         /// <summary>
         /// The UUID of the Avatar of the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_uuid")]
         public string AvatarUuid { get; set; }
-
+    
         /// <summary>
         /// The status of the MonetaryAccountBank. Can be: ACTIVE, BLOCKED, CANCELLED or PENDING_REOPEN
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The sub-status of the MonetaryAccountBank providing extra information regarding the status. Will be NONE for
         /// ACTIVE or PENDING_REOPEN, COMPLETELY or ONLY_ACCEPTING_INCOMING for BLOCKED and REDEMPTION_INVOLUNTARY,
@@ -82,99 +85,105 @@ public class MonetaryAccountBank : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The reason for voluntarily cancelling (closing) the MonetaryAccountBank, can only be OTHER.
         /// </summary>
         [JsonProperty(PropertyName = "reason")]
         public string Reason { get; set; }
-
+    
         /// <summary>
         /// The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountBank. Can be any user
         /// provided message.
         /// </summary>
         [JsonProperty(PropertyName = "reason_description")]
         public string ReasonDescription { get; set; }
-
+    
         /// <summary>
         /// The legal name of the user / company using this monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "display_name")]
         public string DisplayName { get; set; }
-
+    
         /// <summary>
         /// The settings of the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "setting")]
         public MonetaryAccountSetting Setting { get; set; }
-
+    
+        /// <summary>
+        /// The country of the monetary account IBAN.
+        /// </summary>
+        [JsonProperty(PropertyName = "country_iban")]
+        public string CountryIban { get; set; }
+    
         /// <summary>
         /// The id of the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the MonetaryAccountBank's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the MonetaryAccountBank's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The Avatar of the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The maximum Amount the MonetaryAccountBank can be 'in the red'.
         /// </summary>
         [JsonProperty(PropertyName = "overdraft_limit")]
         public Amount OverdraftLimit { get; set; }
-
+    
         /// <summary>
         /// The current available balance Amount of the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "balance")]
         public Amount Balance { get; set; }
-
+    
         /// <summary>
         /// The Aliases for the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public List<Pointer> Alias { get; set; }
-
+    
         /// <summary>
         /// The MonetaryAccountBank's public UUID.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The id of the User who owns the MonetaryAccountBank.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
         public int? UserId { get; set; }
-
+    
         /// <summary>
         /// The profile of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
         public MonetaryAccountProfile MonetaryAccountProfile { get; set; }
-
+    
         /// <summary>
         /// The ids of the AutoSave.
         /// </summary>
         [JsonProperty(PropertyName = "all_auto_save_id")]
         public List<BunqId> AllAutoSaveId { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create new MonetaryAccountBank.
         /// </summary>
@@ -188,51 +197,47 @@ public class MonetaryAccountBank : BunqModel
         /// <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> Create(string currency, string description = null, Amount dailyLimit = null,
-            string avatarUuid = null, string status = null, string subStatus = null, string reason = null,
-            string reasonDescription = null, string displayName = null, MonetaryAccountSetting setting = null,
-            IDictionary<string, string> customHeaders = null)
+        /// <param name="countryIban">The country of the monetary account IBAN.</param>
+        public static BunqResponse<int> Create(string currency, string description = null, Amount dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSetting setting = null, string countryIban = 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_CURRENCY, currency},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_DAILY_LIMIT, dailyLimit},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_STATUS, status},
-                {FIELD_SUB_STATUS, subStatus},
-                {FIELD_REASON, reason},
-                {FIELD_REASON_DESCRIPTION, reasonDescription},
-                {FIELD_DISPLAY_NAME, displayName},
-                {FIELD_SETTING, setting},
-            };
-
+    {
+    {FIELD_CURRENCY, currency},
+    {FIELD_DESCRIPTION, description},
+    {FIELD_DAILY_LIMIT, dailyLimit},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_STATUS, status},
+    {FIELD_SUB_STATUS, subStatus},
+    {FIELD_REASON, reason},
+    {FIELD_REASON_DESCRIPTION, reasonDescription},
+    {FIELD_DISPLAY_NAME, displayName},
+    {FIELD_SETTING, setting},
+    {FIELD_COUNTRY_IBAN, countryIban},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a specific MonetaryAccountBank.
         /// </summary>
-        public static BunqResponse<MonetaryAccountBank> Get(int monetaryAccountBankId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountBank> Get(int monetaryAccountBankId, 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(), monetaryAccountBankId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), monetaryAccountBankId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<MonetaryAccountBank>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Update a specific existing MonetaryAccountBank.
         /// </summary>
@@ -245,53 +250,46 @@ public static BunqResponse<MonetaryAccountBank> Get(int monetaryAccountBankId,
         /// <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,
-            Amount dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null,
-            string reason = null, string reasonDescription = null, string displayName = null,
-            MonetaryAccountSetting setting = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int monetaryAccountBankId, string description = null, Amount dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, string displayName = null, MonetaryAccountSetting setting = 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_DAILY_LIMIT, dailyLimit},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_STATUS, status},
-                {FIELD_SUB_STATUS, subStatus},
-                {FIELD_REASON, reason},
-                {FIELD_REASON_DESCRIPTION, reasonDescription},
-                {FIELD_DISPLAY_NAME, displayName},
-                {FIELD_SETTING, setting},
-            };
-
+    {
+    {FIELD_DESCRIPTION, description},
+    {FIELD_DAILY_LIMIT, dailyLimit},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_STATUS, status},
+    {FIELD_SUB_STATUS, subStatus},
+    {FIELD_REASON, reason},
+    {FIELD_REASON_DESCRIPTION, reasonDescription},
+    {FIELD_DISPLAY_NAME, displayName},
+    {FIELD_SETTING, setting},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), monetaryAccountBankId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), monetaryAccountBankId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Gets a listing of all MonetaryAccountBanks of a given user.
         /// </summary>
-        public static BunqResponse<List<MonetaryAccountBank>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<MonetaryAccountBank>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<MonetaryAccountBank>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -300,110 +298,110 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.Currency != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.DailyLimit != null)
             {
                 return false;
             }
-
+    
             if (this.OverdraftLimit != null)
             {
                 return false;
             }
-
+    
             if (this.Balance != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.Reason != null)
             {
                 return false;
             }
-
+    
             if (this.ReasonDescription != null)
             {
                 return false;
             }
-
+    
             if (this.UserId != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountProfile != null)
             {
                 return false;
             }
-
+    
             if (this.DisplayName != null)
             {
                 return false;
             }
-
+    
             if (this.Setting != null)
             {
                 return false;
             }
-
+    
             if (this.AllAutoSaveId != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccountBank CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccountBank>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccountBank>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountJoint.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountJoint.cs
index c2afd51..43b1562 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountJoint.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountJoint.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +22,7 @@ public class MonetaryAccountJoint : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account-joint/{1}";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account-joint/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account-joint";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -36,55 +38,55 @@ public class MonetaryAccountJoint : BunqModel
         public const string FIELD_REASON_DESCRIPTION = "reason_description";
         public const string FIELD_ALL_CO_OWNER = "all_co_owner";
         public const string FIELD_SETTING = "setting";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "MonetaryAccountJoint";
-
+    
         /// <summary>
         /// The currency of the MonetaryAccountJoint as an ISO 4217 formatted currency code.
         /// </summary>
         [JsonProperty(PropertyName = "currency")]
         public string Currency { get; set; }
-
+    
         /// <summary>
         /// The description of the MonetaryAccountJoint. Defaults to 'bunq account'.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The daily spending limit Amount of the MonetaryAccountJoint. Defaults to 1000 EUR. Currency must match the
         /// MonetaryAccountJoint's currency. Limited to 10000 EUR.
         /// </summary>
         [JsonProperty(PropertyName = "daily_limit")]
         public Amount DailyLimit { get; set; }
-
+    
         /// <summary>
         /// The maximum Amount the MonetaryAccountJoint can be 'in the red'.
         /// </summary>
         [JsonProperty(PropertyName = "overdraft_limit")]
         public Amount OverdraftLimit { get; set; }
-
+    
         /// <summary>
         /// The Aliases for the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public List<Pointer> Alias { get; set; }
-
+    
         /// <summary>
         /// The UUID of the Avatar of the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_uuid")]
         public string AvatarUuid { get; set; }
-
+    
         /// <summary>
         /// The status of the MonetaryAccountJoint. Can be: ACTIVE, BLOCKED, CANCELLED or PENDING_REOPEN
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The sub-status of the MonetaryAccountJoint providing extra information regarding the status. Will be NONE
         /// for ACTIVE or PENDING_REOPEN, COMPLETELY or ONLY_ACCEPTING_INCOMING for BLOCKED and REDEMPTION_INVOLUNTARY,
@@ -92,87 +94,87 @@ public class MonetaryAccountJoint : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The reason for voluntarily cancelling (closing) the MonetaryAccountJoint, can only be OTHER.
         /// </summary>
         [JsonProperty(PropertyName = "reason")]
         public string Reason { get; set; }
-
+    
         /// <summary>
         /// The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountJoint. Can be any user
         /// provided message.
         /// </summary>
         [JsonProperty(PropertyName = "reason_description")]
         public string ReasonDescription { get; set; }
-
+    
         /// <summary>
         /// The users the account will be joint with.
         /// </summary>
         [JsonProperty(PropertyName = "all_co_owner")]
         public List<CoOwner> AllCoOwner { get; set; }
-
+    
         /// <summary>
         /// The settings of the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "setting")]
         public MonetaryAccountSetting Setting { get; set; }
-
+    
         /// <summary>
         /// The id of the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the MonetaryAccountJoint's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the MonetaryAccountJoint's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The Avatar of the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The current available balance Amount of the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "balance")]
         public Amount Balance { get; set; }
-
+    
         /// <summary>
         /// The MonetaryAccountJoint's public UUID.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The id of the User who owns the MonetaryAccountJoint.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
         public int? UserId { get; set; }
-
+    
         /// <summary>
         /// The profile of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
         public MonetaryAccountProfile MonetaryAccountProfile { get; set; }
-
+    
         /// <summary>
         /// The ids of the AutoSave.
         /// </summary>
         [JsonProperty(PropertyName = "all_auto_save_id")]
         public List<BunqId> AllAutoSaveId { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="currency">The currency of the MonetaryAccountJoint as an ISO 4217 formatted currency code.</param>
@@ -187,53 +189,46 @@ public class MonetaryAccountJoint : 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<CoOwner> allCoOwner, string description = null,
-            Amount dailyLimit = null, Amount overdraftLimit = null, List<Pointer> alias = null,
-            string avatarUuid = null, string status = null, string subStatus = null, string reason = null,
-            string reasonDescription = null, MonetaryAccountSetting setting = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(string currency, List<CoOwner> allCoOwner, string description = null, Amount dailyLimit = null, Amount overdraftLimit = null, List<Pointer> alias = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSetting setting = 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_CURRENCY, currency},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_DAILY_LIMIT, dailyLimit},
-                {FIELD_OVERDRAFT_LIMIT, overdraftLimit},
-                {FIELD_ALIAS, alias},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_STATUS, status},
-                {FIELD_SUB_STATUS, subStatus},
-                {FIELD_REASON, reason},
-                {FIELD_REASON_DESCRIPTION, reasonDescription},
-                {FIELD_ALL_CO_OWNER, allCoOwner},
-                {FIELD_SETTING, setting},
-            };
-
+    {
+    {FIELD_CURRENCY, currency},
+    {FIELD_DESCRIPTION, description},
+    {FIELD_DAILY_LIMIT, dailyLimit},
+    {FIELD_OVERDRAFT_LIMIT, overdraftLimit},
+    {FIELD_ALIAS, alias},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_STATUS, status},
+    {FIELD_SUB_STATUS, subStatus},
+    {FIELD_REASON, reason},
+    {FIELD_REASON_DESCRIPTION, reasonDescription},
+    {FIELD_ALL_CO_OWNER, allCoOwner},
+    {FIELD_SETTING, setting},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<MonetaryAccountJoint> Get(int monetaryAccountJointId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountJoint> Get(int monetaryAccountJointId, 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(), monetaryAccountJointId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), monetaryAccountJointId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<MonetaryAccountJoint>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
         /// <param name="description">The description of the MonetaryAccountJoint. Defaults to 'bunq account'.</param>
@@ -244,51 +239,44 @@ public static BunqResponse<MonetaryAccountJoint> Get(int monetaryAccountJointId,
         /// <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,
-            Amount dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null,
-            string reason = null, string reasonDescription = null, MonetaryAccountSetting setting = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int monetaryAccountJointId, string description = null, Amount dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSetting setting = 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_DAILY_LIMIT, dailyLimit},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_STATUS, status},
-                {FIELD_SUB_STATUS, subStatus},
-                {FIELD_REASON, reason},
-                {FIELD_REASON_DESCRIPTION, reasonDescription},
-                {FIELD_SETTING, setting},
-            };
-
+    {
+    {FIELD_DESCRIPTION, description},
+    {FIELD_DAILY_LIMIT, dailyLimit},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_STATUS, status},
+    {FIELD_SUB_STATUS, subStatus},
+    {FIELD_REASON, reason},
+    {FIELD_REASON_DESCRIPTION, reasonDescription},
+    {FIELD_SETTING, setting},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), monetaryAccountJointId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), monetaryAccountJointId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<MonetaryAccountJoint>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<MonetaryAccountJoint>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<MonetaryAccountJoint>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -297,110 +285,110 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.Currency != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.DailyLimit != null)
             {
                 return false;
             }
-
+    
             if (this.OverdraftLimit != null)
             {
                 return false;
             }
-
+    
             if (this.Balance != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.Reason != null)
             {
                 return false;
             }
-
+    
             if (this.ReasonDescription != null)
             {
                 return false;
             }
-
+    
             if (this.AllCoOwner != null)
             {
                 return false;
             }
-
+    
             if (this.UserId != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountProfile != null)
             {
                 return false;
             }
-
+    
             if (this.Setting != null)
             {
                 return false;
             }
-
+    
             if (this.AllAutoSaveId != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccountJoint CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccountJoint>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccountJoint>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountLight.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountLight.cs
index adccbfa..64b4323 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountLight.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountLight.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -25,39 +25,39 @@ public class MonetaryAccountLight : BunqModel
         public const string FIELD_REASON = "reason";
         public const string FIELD_REASON_DESCRIPTION = "reason_description";
         public const string FIELD_SETTING = "setting";
-
-
+    
+    
         /// <summary>
         /// The currency of the MonetaryAccountLight as an ISO 4217 formatted currency code.
         /// </summary>
         [JsonProperty(PropertyName = "currency")]
         public string Currency { get; set; }
-
+    
         /// <summary>
         /// The description of the MonetaryAccountLight. Defaults to 'bunq account'.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The daily spending limit Amount of the MonetaryAccountLight. Defaults to 1000 EUR. Currency must match the
         /// MonetaryAccountLight's currency. Limited to 10000 EUR.
         /// </summary>
         [JsonProperty(PropertyName = "daily_limit")]
         public Amount DailyLimit { get; set; }
-
+    
         /// <summary>
         /// The UUID of the Avatar of the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_uuid")]
         public string AvatarUuid { get; set; }
-
+    
         /// <summary>
         /// The status of the MonetaryAccountLight. Can be: ACTIVE, BLOCKED, CANCELLED or PENDING_REOPEN
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The sub-status of the MonetaryAccountLight providing extra information regarding the status. Will be NONE
         /// for ACTIVE or PENDING_REOPEN, COMPLETELY or ONLY_ACCEPTING_INCOMING for BLOCKED and REDEMPTION_INVOLUNTARY,
@@ -65,117 +65,118 @@ public class MonetaryAccountLight : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The reason for voluntarily cancelling (closing) the MonetaryAccountBank, can only be OTHER.
         /// </summary>
         [JsonProperty(PropertyName = "reason")]
         public string Reason { get; set; }
-
+    
         /// <summary>
         /// The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountBank. Can be any user
         /// provided message.
         /// </summary>
         [JsonProperty(PropertyName = "reason_description")]
         public string ReasonDescription { get; set; }
-
+    
         /// <summary>
         /// The settings of the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "setting")]
         public MonetaryAccountSetting Setting { get; set; }
-
+    
         /// <summary>
         /// The id of the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the MonetaryAccountLight's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the MonetaryAccountLight's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The Avatar of the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The current available balance Amount of the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "balance")]
         public Amount Balance { get; set; }
-
+    
         /// <summary>
         /// The Aliases for the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public List<Pointer> Alias { get; set; }
-
+    
         /// <summary>
         /// The MonetaryAccountLight's public UUID.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The id of the User who owns the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
         public int? UserId { get; set; }
-
+    
         /// <summary>
         /// The maximum balance Amount of the MonetaryAccountLight.
         /// </summary>
         [JsonProperty(PropertyName = "balance_maximum")]
         public Amount BalanceMaximum { get; set; }
-
+    
         /// <summary>
         /// The amount of the monthly budget used.
         /// </summary>
         [JsonProperty(PropertyName = "budget_month_used")]
         public Amount BudgetMonthUsed { get; set; }
-
+    
         /// <summary>
         /// The total amount of the monthly budget.
         /// </summary>
         [JsonProperty(PropertyName = "budget_month_maximum")]
         public Amount BudgetMonthMaximum { get; set; }
-
+    
         /// <summary>
         /// The amount of the yearly budget used.
         /// </summary>
         [JsonProperty(PropertyName = "budget_year_used")]
         public Amount BudgetYearUsed { get; set; }
-
+    
         /// <summary>
         /// The total amount of the yearly budget.
         /// </summary>
         [JsonProperty(PropertyName = "budget_year_maximum")]
         public Amount BudgetYearMaximum { get; set; }
-
+    
         /// <summary>
         /// The amount of the yearly withdrawal budget used.
         /// </summary>
         [JsonProperty(PropertyName = "budget_withdrawal_year_used")]
         public Amount BudgetWithdrawalYearUsed { get; set; }
-
+    
         /// <summary>
         /// The total amount of the yearly withdrawal budget.
         /// </summary>
         [JsonProperty(PropertyName = "budget_withdrawal_year_maximum")]
         public Amount BudgetWithdrawalYearMaximum { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -184,125 +185,125 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.Currency != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.DailyLimit != null)
             {
                 return false;
             }
-
+    
             if (this.Balance != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.Reason != null)
             {
                 return false;
             }
-
+    
             if (this.ReasonDescription != null)
             {
                 return false;
             }
-
+    
             if (this.UserId != null)
             {
                 return false;
             }
-
+    
             if (this.BalanceMaximum != null)
             {
                 return false;
             }
-
+    
             if (this.BudgetMonthUsed != null)
             {
                 return false;
             }
-
+    
             if (this.BudgetMonthMaximum != null)
             {
                 return false;
             }
-
+    
             if (this.BudgetYearUsed != null)
             {
                 return false;
             }
-
+    
             if (this.BudgetYearMaximum != null)
             {
                 return false;
             }
-
+    
             if (this.BudgetWithdrawalYearUsed != null)
             {
                 return false;
             }
-
+    
             if (this.BudgetWithdrawalYearMaximum != null)
             {
                 return false;
             }
-
+    
             if (this.Setting != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccountLight CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccountLight>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccountLight>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountProfile.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountProfile.cs
index 7354789..7799a56 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountProfile.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountProfile.cs
@@ -1,6 +1,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -14,21 +15,22 @@ public class MonetaryAccountProfile : BunqModel
         /// </summary>
         public const string FIELD_PROFILE_FILL = "profile_fill";
         public const string FIELD_PROFILE_DRAIN = "profile_drain";
-
-
+    
+    
         /// <summary>
         /// The profile settings for triggering the fill of a monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "profile_fill")]
         public MonetaryAccountProfileFill ProfileFill { get; set; }
-
+    
         /// <summary>
         /// The profile settings for moving excesses to a savings account
         /// </summary>
         [JsonProperty(PropertyName = "profile_drain")]
         public MonetaryAccountProfileDrain ProfileDrain { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -37,20 +39,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ProfileDrain != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccountProfile CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccountProfile>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccountProfile>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSavings.cs b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSavings.cs
index f26ff50..a3dbd44 100644
--- a/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSavings.cs
+++ b/BunqSdk/Model/Generated/Endpoint/MonetaryAccountSavings.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +22,7 @@ public class MonetaryAccountSavings : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account-savings/{1}";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account-savings/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account-savings";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -35,43 +37,43 @@ public class MonetaryAccountSavings : BunqModel
         public const string FIELD_ALL_CO_OWNER = "all_co_owner";
         public const string FIELD_SETTING = "setting";
         public const string FIELD_SAVINGS_GOAL = "savings_goal";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "MonetaryAccountSavings";
-
+    
         /// <summary>
         /// The currency of the MonetaryAccountSavings as an ISO 4217 formatted currency code.
         /// </summary>
         [JsonProperty(PropertyName = "currency")]
         public string Currency { get; set; }
-
+    
         /// <summary>
         /// The description of the MonetaryAccountSavings. Defaults to 'bunq account'.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The daily spending limit Amount of the MonetaryAccountSavings. Defaults to 1000 EUR. Currency must match the
         /// MonetaryAccountSavings's currency. Limited to 10000 EUR.
         /// </summary>
         [JsonProperty(PropertyName = "daily_limit")]
         public Amount DailyLimit { get; set; }
-
+    
         /// <summary>
         /// The UUID of the Avatar of the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_uuid")]
         public string AvatarUuid { get; set; }
-
+    
         /// <summary>
         /// The status of the MonetaryAccountSavings. Can be: ACTIVE, BLOCKED, CANCELLED or PENDING_REOPEN
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The sub-status of the MonetaryAccountSavings providing extra information regarding the status. Will be NONE
         /// for ACTIVE or PENDING_REOPEN, COMPLETELY or ONLY_ACCEPTING_INCOMING for BLOCKED and REDEMPTION_INVOLUNTARY,
@@ -79,111 +81,111 @@ public class MonetaryAccountSavings : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The reason for voluntarily cancelling (closing) the MonetaryAccountSavings, can only be OTHER.
         /// </summary>
         [JsonProperty(PropertyName = "reason")]
         public string Reason { get; set; }
-
+    
         /// <summary>
         /// The optional free-form reason for voluntarily cancelling (closing) the MonetaryAccountSavings. Can be any
         /// user provided message.
         /// </summary>
         [JsonProperty(PropertyName = "reason_description")]
         public string ReasonDescription { get; set; }
-
+    
         /// <summary>
         /// The users the account will be joint with.
         /// </summary>
         [JsonProperty(PropertyName = "all_co_owner")]
         public List<CoOwner> AllCoOwner { get; set; }
-
+    
         /// <summary>
         /// The settings of the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "setting")]
         public MonetaryAccountSetting Setting { get; set; }
-
+    
         /// <summary>
         /// The Savings Goal set for this MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "savings_goal")]
         public Amount SavingsGoal { get; set; }
-
+    
         /// <summary>
         /// The id of the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the MonetaryAccountSavings's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the MonetaryAccountSavings's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The Avatar of the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The maximum Amount the MonetaryAccountSavings can be 'in the red'. Must be 0 EUR or omitted.
         /// </summary>
         [JsonProperty(PropertyName = "overdraft_limit")]
         public Amount OverdraftLimit { get; set; }
-
+    
         /// <summary>
         /// The current available balance Amount of the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "balance")]
         public Amount Balance { get; set; }
-
+    
         /// <summary>
         /// The Aliases for the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public List<Pointer> Alias { get; set; }
-
+    
         /// <summary>
         /// The MonetaryAccountSavings's public UUID.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The id of the User who owns the MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
         public int? UserId { get; set; }
-
+    
         /// <summary>
         /// The profile of the account.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_profile")]
         public MonetaryAccountProfile MonetaryAccountProfile { get; set; }
-
+    
         /// <summary>
         /// The progress in percentages for the Savings Goal set for this MonetaryAccountSavings.
         /// </summary>
         [JsonProperty(PropertyName = "savings_goal_progress")]
         public double? SavingsGoalProgress { get; set; }
-
+    
         /// <summary>
         /// The ids of the AutoSave.
         /// </summary>
         [JsonProperty(PropertyName = "all_auto_save_id")]
         public List<BunqId> AllAutoSaveId { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create new MonetaryAccountSavings.
         /// </summary>
@@ -198,53 +200,46 @@ public class MonetaryAccountSavings : 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, Amount dailyLimit = null,
-            string avatarUuid = null, string status = null, string subStatus = null, string reason = null,
-            string reasonDescription = null, List<CoOwner> allCoOwner = null, MonetaryAccountSetting setting = null,
-            Amount savingsGoal = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(string currency, string description = null, Amount dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, List<CoOwner> allCoOwner = null, MonetaryAccountSetting setting = null, Amount savingsGoal = 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_CURRENCY, currency},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_DAILY_LIMIT, dailyLimit},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_STATUS, status},
-                {FIELD_SUB_STATUS, subStatus},
-                {FIELD_REASON, reason},
-                {FIELD_REASON_DESCRIPTION, reasonDescription},
-                {FIELD_ALL_CO_OWNER, allCoOwner},
-                {FIELD_SETTING, setting},
-                {FIELD_SAVINGS_GOAL, savingsGoal},
-            };
-
+    {
+    {FIELD_CURRENCY, currency},
+    {FIELD_DESCRIPTION, description},
+    {FIELD_DAILY_LIMIT, dailyLimit},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_STATUS, status},
+    {FIELD_SUB_STATUS, subStatus},
+    {FIELD_REASON, reason},
+    {FIELD_REASON_DESCRIPTION, reasonDescription},
+    {FIELD_ALL_CO_OWNER, allCoOwner},
+    {FIELD_SETTING, setting},
+    {FIELD_SAVINGS_GOAL, savingsGoal},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a specific MonetaryAccountSavings.
         /// </summary>
-        public static BunqResponse<MonetaryAccountSavings> Get(int monetaryAccountSavingsId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<MonetaryAccountSavings> Get(int monetaryAccountSavingsId, 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(), monetaryAccountSavingsId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), monetaryAccountSavingsId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<MonetaryAccountSavings>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Update a specific existing MonetaryAccountSavings.
         /// </summary>
@@ -257,53 +252,46 @@ public static BunqResponse<MonetaryAccountSavings> Get(int monetaryAccountSaving
         /// <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,
-            Amount dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null,
-            string reason = null, string reasonDescription = null, MonetaryAccountSetting setting = null,
-            Amount savingsGoal = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int monetaryAccountSavingsId, string description = null, Amount dailyLimit = null, string avatarUuid = null, string status = null, string subStatus = null, string reason = null, string reasonDescription = null, MonetaryAccountSetting setting = null, Amount savingsGoal = 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_DAILY_LIMIT, dailyLimit},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_STATUS, status},
-                {FIELD_SUB_STATUS, subStatus},
-                {FIELD_REASON, reason},
-                {FIELD_REASON_DESCRIPTION, reasonDescription},
-                {FIELD_SETTING, setting},
-                {FIELD_SAVINGS_GOAL, savingsGoal},
-            };
-
+    {
+    {FIELD_DESCRIPTION, description},
+    {FIELD_DAILY_LIMIT, dailyLimit},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_STATUS, status},
+    {FIELD_SUB_STATUS, subStatus},
+    {FIELD_REASON, reason},
+    {FIELD_REASON_DESCRIPTION, reasonDescription},
+    {FIELD_SETTING, setting},
+    {FIELD_SAVINGS_GOAL, savingsGoal},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), monetaryAccountSavingsId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), monetaryAccountSavingsId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Gets a listing of all MonetaryAccountSavingss of a given user.
         /// </summary>
-        public static BunqResponse<List<MonetaryAccountSavings>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<MonetaryAccountSavings>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<MonetaryAccountSavings>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -312,120 +300,120 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.Currency != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.DailyLimit != null)
             {
                 return false;
             }
-
+    
             if (this.OverdraftLimit != null)
             {
                 return false;
             }
-
+    
             if (this.Balance != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.Reason != null)
             {
                 return false;
             }
-
+    
             if (this.ReasonDescription != null)
             {
                 return false;
             }
-
+    
             if (this.AllCoOwner != null)
             {
                 return false;
             }
-
+    
             if (this.UserId != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountProfile != null)
             {
                 return false;
             }
-
+    
             if (this.Setting != null)
             {
                 return false;
             }
-
+    
             if (this.SavingsGoal != null)
             {
                 return false;
             }
-
+    
             if (this.SavingsGoalProgress != null)
             {
                 return false;
             }
-
+    
             if (this.AllAutoSaveId != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccountSavings CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccountSavings>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccountSavings>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment.cs
index d980fa6..648af21 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,179 +18,147 @@ public class NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment : BunqMod
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/switch-service-payment/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int switchServicePaymentId, int? attachmentId,
-            int? monetaryAccountId = null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int switchServicePaymentId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        switchServicePaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int switchServicePaymentId, int noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Put(
-                string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                    switchServicePaymentId, noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId, noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int switchServicePaymentId,
-            int noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int switchServicePaymentId, int noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, int? 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),
-                        switchServicePaymentId, noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId),
-                    customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId, noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment>> List(
-            int switchServicePaymentId, int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment>> List(int switchServicePaymentId, int? 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), switchServicePaymentId), urlParams,
-                    customHeaders);
-
-            return FromJsonList<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment>(responseRaw,
-                OBJECT_TYPE_GET);
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId), urlParams, customHeaders);
+    
+            return FromJsonList<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment> Get(
-            int switchServicePaymentId, int noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment> Get(int switchServicePaymentId, int noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId, int? 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),
-                    switchServicePaymentId, noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId, noteAttachmentBankSwitchServiceNetherlandsIncomingPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -197,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentBankSwitchServiceNetherlandsIncomingPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBunqMeFundraiserResult.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBunqMeFundraiserResult.cs
index 09b8741..0b64a2c 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBunqMeFundraiserResult.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentBunqMeFundraiserResult.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,176 +18,147 @@ public class NoteAttachmentBunqMeFundraiserResult : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int bunqmeFundraiserResultId, int? attachmentId,
-            int? monetaryAccountId = null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int bunqmeFundraiserResultId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        bunqmeFundraiserResultId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int bunqmeFundraiserResultId, int noteAttachmentBunqMeFundraiserResultId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        bunqmeFundraiserResultId, noteAttachmentBunqMeFundraiserResultId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId, noteAttachmentBunqMeFundraiserResultId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int bunqmeFundraiserResultId,
-            int noteAttachmentBunqMeFundraiserResultId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int bunqmeFundraiserResultId, int noteAttachmentBunqMeFundraiserResultId, int? 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),
-                        bunqmeFundraiserResultId, noteAttachmentBunqMeFundraiserResultId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId, noteAttachmentBunqMeFundraiserResultId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentBunqMeFundraiserResult>> List(int bunqmeFundraiserResultId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentBunqMeFundraiserResult>> List(int bunqmeFundraiserResultId, int? 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), bunqmeFundraiserResultId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentBunqMeFundraiserResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentBunqMeFundraiserResult> Get(int bunqmeFundraiserResultId,
-            int noteAttachmentBunqMeFundraiserResultId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentBunqMeFundraiserResult> Get(int bunqmeFundraiserResultId, int noteAttachmentBunqMeFundraiserResultId, int? 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),
-                    bunqmeFundraiserResultId, noteAttachmentBunqMeFundraiserResultId), new Dictionary<string, string>(),
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId, noteAttachmentBunqMeFundraiserResultId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentBunqMeFundraiserResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -194,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentBunqMeFundraiserResult CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentBunqMeFundraiserResult>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentBunqMeFundraiserResult>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentDraftPayment.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentDraftPayment.cs
index 5e9166f..3861c8a 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentDraftPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentDraftPayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -17,170 +19,146 @@ public class NoteAttachmentDraftPayment : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/draft-payment/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/draft-payment/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/draft-payment/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/draft-payment/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/draft-payment/{2}/note-attachment/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/draft-payment/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/draft-payment/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/draft-payment/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int draftPaymentId, int? attachmentId, int? monetaryAccountId = null,
-            string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int draftPaymentId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        draftPaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int draftPaymentId, int noteAttachmentDraftPaymentId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        draftPaymentId, noteAttachmentDraftPaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId, noteAttachmentDraftPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int draftPaymentId, int noteAttachmentDraftPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int draftPaymentId, int noteAttachmentDraftPaymentId, int? 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),
-                        draftPaymentId, noteAttachmentDraftPaymentId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId, noteAttachmentDraftPaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentDraftPayment>> List(int draftPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentDraftPayment>> List(int draftPaymentId, int? 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), draftPaymentId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentDraftPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentDraftPayment> Get(int draftPaymentId, int noteAttachmentDraftPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentDraftPayment> Get(int draftPaymentId, int noteAttachmentDraftPaymentId, int? 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),
-                        draftPaymentId, noteAttachmentDraftPaymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId, noteAttachmentDraftPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentDraftPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -189,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentDraftPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentDraftPayment>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentDraftPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentIdealMerchantTransaction.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentIdealMerchantTransaction.cs
index 470f30a..edb8324 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentIdealMerchantTransaction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentIdealMerchantTransaction.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,178 +18,147 @@ public class NoteAttachmentIdealMerchantTransaction : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int idealMerchantTransactionId, int? attachmentId,
-            int? monetaryAccountId = null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int idealMerchantTransactionId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        idealMerchantTransactionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int idealMerchantTransactionId, int noteAttachmentIdealMerchantTransactionId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        idealMerchantTransactionId, noteAttachmentIdealMerchantTransactionId), requestBytes,
-                    customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId, noteAttachmentIdealMerchantTransactionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int idealMerchantTransactionId,
-            int noteAttachmentIdealMerchantTransactionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int idealMerchantTransactionId, int noteAttachmentIdealMerchantTransactionId, int? 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),
-                        idealMerchantTransactionId, noteAttachmentIdealMerchantTransactionId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId, noteAttachmentIdealMerchantTransactionId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentIdealMerchantTransaction>> List(int idealMerchantTransactionId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentIdealMerchantTransaction>> List(int idealMerchantTransactionId, int? 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), idealMerchantTransactionId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentIdealMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentIdealMerchantTransaction> Get(int idealMerchantTransactionId,
-            int noteAttachmentIdealMerchantTransactionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentIdealMerchantTransaction> Get(int idealMerchantTransactionId, int noteAttachmentIdealMerchantTransactionId, int? 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),
-                    idealMerchantTransactionId, noteAttachmentIdealMerchantTransactionId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId, noteAttachmentIdealMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentIdealMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -196,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentIdealMerchantTransaction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentIdealMerchantTransaction>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentIdealMerchantTransaction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentMasterCardAction.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentMasterCardAction.cs
index c16c15e..9300218 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentMasterCardAction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentMasterCardAction.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,175 +18,147 @@ public class NoteAttachmentMasterCardAction : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/mastercard-action/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int mastercardActionId, int? attachmentId, int? monetaryAccountId = null,
-            string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int mastercardActionId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        mastercardActionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int mastercardActionId, int noteAttachmentMasterCardActionId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        mastercardActionId, noteAttachmentMasterCardActionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId, noteAttachmentMasterCardActionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int mastercardActionId, int noteAttachmentMasterCardActionId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int mastercardActionId, int noteAttachmentMasterCardActionId, int? 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),
-                        mastercardActionId, noteAttachmentMasterCardActionId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId, noteAttachmentMasterCardActionId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentMasterCardAction>> List(int mastercardActionId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentMasterCardAction>> List(int mastercardActionId, int? 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), mastercardActionId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentMasterCardAction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentMasterCardAction> Get(int mastercardActionId,
-            int noteAttachmentMasterCardActionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentMasterCardAction> Get(int mastercardActionId, int noteAttachmentMasterCardActionId, int? 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),
-                        mastercardActionId, noteAttachmentMasterCardActionId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId, noteAttachmentMasterCardActionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentMasterCardAction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -193,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentMasterCardAction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentMasterCardAction>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentMasterCardAction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPayment.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPayment.cs
index e238fde..19d9267 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,162 +23,142 @@ public class NoteAttachmentPayment : BunqModel
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/payment/{2}/note-attachment/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment/{2}/note-attachment";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int paymentId, int? attachmentId, int? monetaryAccountId = null,
-            string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int paymentId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        paymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int paymentId, int noteAttachmentPaymentId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        paymentId, noteAttachmentPaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId, noteAttachmentPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentId, int noteAttachmentPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int paymentId, int noteAttachmentPaymentId, int? 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),
-                        paymentId, noteAttachmentPaymentId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId, noteAttachmentPaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentPayment>> List(int paymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentPayment>> List(int paymentId, int? 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), paymentId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentPayment> Get(int paymentId, int noteAttachmentPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentPayment> Get(int paymentId, int noteAttachmentPaymentId, int? 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),
-                        paymentId, noteAttachmentPaymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId, noteAttachmentPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -185,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentPayment>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentBatch.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentBatch.cs
index 05ef170..7191cf6 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentPaymentBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -17,170 +19,146 @@ public class NoteAttachmentPaymentBatch : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/payment-batch/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/payment-batch/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/payment-batch/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/payment-batch/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/payment-batch/{2}/note-attachment/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-batch/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/payment-batch/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment-batch/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int paymentBatchId, int? attachmentId, int? monetaryAccountId = null,
-            string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int paymentBatchId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        paymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int paymentBatchId, int noteAttachmentPaymentBatchId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        paymentBatchId, noteAttachmentPaymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId, noteAttachmentPaymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentBatchId, int noteAttachmentPaymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int paymentBatchId, int noteAttachmentPaymentBatchId, int? 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),
-                        paymentBatchId, noteAttachmentPaymentBatchId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId, noteAttachmentPaymentBatchId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentPaymentBatch>> List(int paymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentPaymentBatch>> List(int paymentBatchId, int? 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), paymentBatchId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentPaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentPaymentBatch> Get(int paymentBatchId, int noteAttachmentPaymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentPaymentBatch> Get(int paymentBatchId, int noteAttachmentPaymentBatchId, int? 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, noteAttachmentPaymentBatchId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId, noteAttachmentPaymentBatchId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentPaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -189,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentPaymentBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentPaymentBatch>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentPaymentBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiry.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiry.cs
index 72c7d77..4caae71 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiry.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiry.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,175 +18,147 @@ public class NoteAttachmentRequestInquiry : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-inquiry/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int requestInquiryId, int? attachmentId, int? monetaryAccountId = null,
-            string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int requestInquiryId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        requestInquiryId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int requestInquiryId, int noteAttachmentRequestInquiryId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestInquiryId, noteAttachmentRequestInquiryId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId, noteAttachmentRequestInquiryId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestInquiryId, int noteAttachmentRequestInquiryId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int requestInquiryId, int noteAttachmentRequestInquiryId, int? 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),
-                        requestInquiryId, noteAttachmentRequestInquiryId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId, noteAttachmentRequestInquiryId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentRequestInquiry>> List(int requestInquiryId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentRequestInquiry>> List(int requestInquiryId, int? 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), requestInquiryId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentRequestInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentRequestInquiry> Get(int requestInquiryId,
-            int noteAttachmentRequestInquiryId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentRequestInquiry> Get(int requestInquiryId, int noteAttachmentRequestInquiryId, int? 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),
-                        requestInquiryId, noteAttachmentRequestInquiryId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId, noteAttachmentRequestInquiryId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentRequestInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -193,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentRequestInquiry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentRequestInquiry>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentRequestInquiry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryBatch.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryBatch.cs
index 41a4e5c..bb87951 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestInquiryBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,176 +18,147 @@ public class NoteAttachmentRequestInquiryBatch : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-inquiry-batch/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int requestInquiryBatchId, int? attachmentId,
-            int? monetaryAccountId = null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int requestInquiryBatchId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        requestInquiryBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int requestInquiryBatchId, int noteAttachmentRequestInquiryBatchId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestInquiryBatchId, noteAttachmentRequestInquiryBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId, noteAttachmentRequestInquiryBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestInquiryBatchId, int noteAttachmentRequestInquiryBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int requestInquiryBatchId, int noteAttachmentRequestInquiryBatchId, int? 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),
-                        requestInquiryBatchId, noteAttachmentRequestInquiryBatchId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId, noteAttachmentRequestInquiryBatchId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentRequestInquiryBatch>> List(int requestInquiryBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentRequestInquiryBatch>> List(int requestInquiryBatchId, int? 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), requestInquiryBatchId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentRequestInquiryBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentRequestInquiryBatch> Get(int requestInquiryBatchId,
-            int noteAttachmentRequestInquiryBatchId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentRequestInquiryBatch> Get(int requestInquiryBatchId, int noteAttachmentRequestInquiryBatchId, int? 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),
-                        requestInquiryBatchId, noteAttachmentRequestInquiryBatchId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId, noteAttachmentRequestInquiryBatchId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentRequestInquiryBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -194,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentRequestInquiryBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentRequestInquiryBatch>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentRequestInquiryBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestResponse.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestResponse.cs
index 0e0bc09..4ff8caf 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestResponse.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentRequestResponse.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,175 +18,147 @@ public class NoteAttachmentRequestResponse : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-response/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-response/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int requestResponseId, int? attachmentId, int? monetaryAccountId = null,
-            string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int requestResponseId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        requestResponseId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int requestResponseId, int noteAttachmentRequestResponseId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestResponseId, noteAttachmentRequestResponseId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId, noteAttachmentRequestResponseId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestResponseId, int noteAttachmentRequestResponseId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int requestResponseId, int noteAttachmentRequestResponseId, int? 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),
-                        requestResponseId, noteAttachmentRequestResponseId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId, noteAttachmentRequestResponseId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentRequestResponse>> List(int requestResponseId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentRequestResponse>> List(int requestResponseId, int? 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), requestResponseId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentRequestResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentRequestResponse> Get(int requestResponseId,
-            int noteAttachmentRequestResponseId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentRequestResponse> Get(int requestResponseId, int noteAttachmentRequestResponseId, int? 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),
-                        requestResponseId, noteAttachmentRequestResponseId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId, noteAttachmentRequestResponseId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentRequestResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -193,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentRequestResponse CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentRequestResponse>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentRequestResponse>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleInstance.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleInstance.cs
index 23d4df6..c29f5ab 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleInstance.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentScheduleInstance.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,177 +18,147 @@ public class NoteAttachmentScheduleInstance : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment/{4}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment/{4}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment/{4}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment/{4}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment/{4}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-attachment/{4}";
+    
         /// <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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int scheduleId, int scheduleInstanceId, int? attachmentId,
-            int? monetaryAccountId = null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int scheduleId, int scheduleInstanceId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        scheduleId, scheduleInstanceId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int scheduleId, int scheduleInstanceId, int noteAttachmentScheduleInstanceId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        scheduleId, scheduleInstanceId, noteAttachmentScheduleInstanceId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId, noteAttachmentScheduleInstanceId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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(int scheduleId, int scheduleInstanceId, int noteAttachmentScheduleInstanceId, int? 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),
-                        scheduleId, scheduleInstanceId, noteAttachmentScheduleInstanceId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId, noteAttachmentScheduleInstanceId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentScheduleInstance>> List(int scheduleId, int scheduleInstanceId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentScheduleInstance>> List(int scheduleId, int scheduleInstanceId, int? 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), scheduleId, scheduleInstanceId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentScheduleInstance>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentScheduleInstance> Get(int scheduleId, int scheduleInstanceId,
-            int noteAttachmentScheduleInstanceId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentScheduleInstance> Get(int scheduleId, int scheduleInstanceId, int noteAttachmentScheduleInstanceId, int? 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),
-                    scheduleId, scheduleInstanceId, noteAttachmentScheduleInstanceId), new Dictionary<string, string>(),
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId, noteAttachmentScheduleInstanceId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentScheduleInstance>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -195,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentScheduleInstance CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentScheduleInstance>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentScheduleInstance>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePayment.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePayment.cs
index 247e12a..d823e12 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,175 +18,147 @@ public class NoteAttachmentSchedulePayment : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule-payment/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int schedulePaymentId, int? attachmentId, int? monetaryAccountId = null,
-            string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int schedulePaymentId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        schedulePaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int schedulePaymentId, int noteAttachmentSchedulePaymentId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        schedulePaymentId, noteAttachmentSchedulePaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId, noteAttachmentSchedulePaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentId, int noteAttachmentSchedulePaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int schedulePaymentId, int noteAttachmentSchedulePaymentId, int? 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),
-                        schedulePaymentId, noteAttachmentSchedulePaymentId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId, noteAttachmentSchedulePaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentSchedulePayment>> List(int schedulePaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentSchedulePayment>> List(int schedulePaymentId, int? 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), schedulePaymentId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentSchedulePayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentSchedulePayment> Get(int schedulePaymentId,
-            int noteAttachmentSchedulePaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentSchedulePayment> Get(int schedulePaymentId, int noteAttachmentSchedulePaymentId, int? 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),
-                        schedulePaymentId, noteAttachmentSchedulePaymentId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId, noteAttachmentSchedulePaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentSchedulePayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -193,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentSchedulePayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentSchedulePayment>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentSchedulePayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentBatch.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentBatch.cs
index 4b6f9f8..46a685c 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSchedulePaymentBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,176 +18,147 @@ public class NoteAttachmentSchedulePaymentBatch : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule-payment-batch/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int schedulePaymentBatchId, int? attachmentId,
-            int? monetaryAccountId = null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int schedulePaymentBatchId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        schedulePaymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int schedulePaymentBatchId, int noteAttachmentSchedulePaymentBatchId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        schedulePaymentBatchId, noteAttachmentSchedulePaymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId, noteAttachmentSchedulePaymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int noteAttachmentSchedulePaymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int noteAttachmentSchedulePaymentBatchId, int? 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),
-                        schedulePaymentBatchId, noteAttachmentSchedulePaymentBatchId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId, noteAttachmentSchedulePaymentBatchId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentSchedulePaymentBatch>> List(int schedulePaymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentSchedulePaymentBatch>> List(int schedulePaymentBatchId, int? 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), schedulePaymentBatchId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentSchedulePaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentSchedulePaymentBatch> Get(int schedulePaymentBatchId,
-            int noteAttachmentSchedulePaymentBatchId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentSchedulePaymentBatch> Get(int schedulePaymentBatchId, int noteAttachmentSchedulePaymentBatchId, int? 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),
-                        schedulePaymentBatchId, noteAttachmentSchedulePaymentBatchId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId, noteAttachmentSchedulePaymentBatchId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentSchedulePaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -194,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentSchedulePaymentBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentSchedulePaymentBatch>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentSchedulePaymentBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSofortMerchantTransaction.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSofortMerchantTransaction.cs
index f5eb9a9..9884f65 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSofortMerchantTransaction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentSofortMerchantTransaction.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,178 +18,147 @@ public class NoteAttachmentSofortMerchantTransaction : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int sofortMerchantTransactionId, int? attachmentId,
-            int? monetaryAccountId = null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int sofortMerchantTransactionId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        sofortMerchantTransactionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int sofortMerchantTransactionId, int noteAttachmentSofortMerchantTransactionId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        sofortMerchantTransactionId, noteAttachmentSofortMerchantTransactionId), requestBytes,
-                    customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId, noteAttachmentSofortMerchantTransactionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int sofortMerchantTransactionId,
-            int noteAttachmentSofortMerchantTransactionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int sofortMerchantTransactionId, int noteAttachmentSofortMerchantTransactionId, int? 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),
-                        sofortMerchantTransactionId, noteAttachmentSofortMerchantTransactionId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId, noteAttachmentSofortMerchantTransactionId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentSofortMerchantTransaction>> List(int sofortMerchantTransactionId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentSofortMerchantTransaction>> List(int sofortMerchantTransactionId, int? 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), sofortMerchantTransactionId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentSofortMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentSofortMerchantTransaction> Get(int sofortMerchantTransactionId,
-            int noteAttachmentSofortMerchantTransactionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentSofortMerchantTransaction> Get(int sofortMerchantTransactionId, int noteAttachmentSofortMerchantTransactionId, int? 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),
-                    sofortMerchantTransactionId, noteAttachmentSofortMerchantTransactionId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId, noteAttachmentSofortMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentSofortMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -196,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentSofortMerchantTransaction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentSofortMerchantTransaction>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentSofortMerchantTransaction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentWhitelistResult.cs b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentWhitelistResult.cs
index 853ef0b..b086a96 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteAttachmentWhitelistResult.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteAttachmentWhitelistResult.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,177 +18,147 @@ public class NoteAttachmentWhitelistResult : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment/{4}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment/{4}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment/{4}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment/{4}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment/{4}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-attachment/{4}";
+    
         /// <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 int? AttachmentId { get; set; }
-
+    
         /// <summary>
         /// The id of the note.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 LabelUser LabelUserCreator { get; set; }
-
+    
         /// <summary>
         /// The attachment attached to the note.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> 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<int> Create(int whitelistId, int whitelistResultId, int? attachmentId,
-            int? monetaryAccountId = null, string description = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int whitelistId, int whitelistResultId, int? attachmentId, int? 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},
-            };
-
+    {
+    {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),
-                        whitelistId, whitelistResultId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int whitelistId, int whitelistResultId, int noteAttachmentWhitelistResultId, int? 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_DESCRIPTION, description},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        whitelistId, whitelistResultId, noteAttachmentWhitelistResultId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId, noteAttachmentWhitelistResultId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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(int whitelistId, int whitelistResultId, int noteAttachmentWhitelistResultId, int? 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),
-                        whitelistId, whitelistResultId, noteAttachmentWhitelistResultId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId, noteAttachmentWhitelistResultId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteAttachmentWhitelistResult>> List(int whitelistId, int whitelistResultId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteAttachmentWhitelistResult>> List(int whitelistId, int whitelistResultId, int? 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), whitelistId, whitelistResultId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId), urlParams, customHeaders);
+    
             return FromJsonList<NoteAttachmentWhitelistResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteAttachmentWhitelistResult> Get(int whitelistId, int whitelistResultId,
-            int noteAttachmentWhitelistResultId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteAttachmentWhitelistResult> Get(int whitelistId, int whitelistResultId, int noteAttachmentWhitelistResultId, int? 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),
-                    whitelistId, whitelistResultId, noteAttachmentWhitelistResultId), new Dictionary<string, string>(),
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId, noteAttachmentWhitelistResultId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteAttachmentWhitelistResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -195,40 +167,40 @@ public override bool IsAllFieldNull()
             {
                 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 NoteAttachmentWhitelistResult CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteAttachmentWhitelistResult>(json);
+            return BunqModel.CreateFromJsonString<NoteAttachmentWhitelistResult>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextBankSwitchServiceNetherlandsIncomingPayment.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextBankSwitchServiceNetherlandsIncomingPayment.cs
index 0e84e1b..cb92f6d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextBankSwitchServiceNetherlandsIncomingPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextBankSwitchServiceNetherlandsIncomingPayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,163 +18,132 @@ public class NoteTextBankSwitchServiceNetherlandsIncomingPayment : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/switch-service-payment/{2}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/switch-service-payment/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int switchServicePaymentId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        switchServicePaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int switchServicePaymentId, int noteTextBankSwitchServiceNetherlandsIncomingPaymentId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        switchServicePaymentId, noteTextBankSwitchServiceNetherlandsIncomingPaymentId), requestBytes,
-                    customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId, noteTextBankSwitchServiceNetherlandsIncomingPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int switchServicePaymentId,
-            int noteTextBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int switchServicePaymentId, int noteTextBankSwitchServiceNetherlandsIncomingPaymentId, int? 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),
-                        switchServicePaymentId, noteTextBankSwitchServiceNetherlandsIncomingPaymentId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId, noteTextBankSwitchServiceNetherlandsIncomingPaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextBankSwitchServiceNetherlandsIncomingPayment>> List(
-            int switchServicePaymentId, int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextBankSwitchServiceNetherlandsIncomingPayment>> List(int switchServicePaymentId, int? 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), switchServicePaymentId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextBankSwitchServiceNetherlandsIncomingPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextBankSwitchServiceNetherlandsIncomingPayment> Get(int switchServicePaymentId,
-            int noteTextBankSwitchServiceNetherlandsIncomingPaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextBankSwitchServiceNetherlandsIncomingPayment> Get(int switchServicePaymentId, int noteTextBankSwitchServiceNetherlandsIncomingPaymentId, int? 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),
-                    switchServicePaymentId, noteTextBankSwitchServiceNetherlandsIncomingPaymentId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), switchServicePaymentId, noteTextBankSwitchServiceNetherlandsIncomingPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextBankSwitchServiceNetherlandsIncomingPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -181,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextBankSwitchServiceNetherlandsIncomingPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextBankSwitchServiceNetherlandsIncomingPayment>(json);
+            return BunqModel.CreateFromJsonString<NoteTextBankSwitchServiceNetherlandsIncomingPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextBunqMeFundraiserResult.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextBunqMeFundraiserResult.cs
index d85c432..b871b5b 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextBunqMeFundraiserResult.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextBunqMeFundraiserResult.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,161 +18,132 @@ public class NoteTextBunqMeFundraiserResult : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{2}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/bunqme-fundraiser-result/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int bunqmeFundraiserResultId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        bunqmeFundraiserResultId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int bunqmeFundraiserResultId, int noteTextBunqMeFundraiserResultId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        bunqmeFundraiserResultId, noteTextBunqMeFundraiserResultId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId, noteTextBunqMeFundraiserResultId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int bunqmeFundraiserResultId, int noteTextBunqMeFundraiserResultId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int bunqmeFundraiserResultId, int noteTextBunqMeFundraiserResultId, int? 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),
-                        bunqmeFundraiserResultId, noteTextBunqMeFundraiserResultId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId, noteTextBunqMeFundraiserResultId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextBunqMeFundraiserResult>> List(int bunqmeFundraiserResultId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextBunqMeFundraiserResult>> List(int bunqmeFundraiserResultId, int? 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), bunqmeFundraiserResultId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextBunqMeFundraiserResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextBunqMeFundraiserResult> Get(int bunqmeFundraiserResultId,
-            int noteTextBunqMeFundraiserResultId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextBunqMeFundraiserResult> Get(int bunqmeFundraiserResultId, int noteTextBunqMeFundraiserResultId, int? 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),
-                        bunqmeFundraiserResultId, noteTextBunqMeFundraiserResultId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), bunqmeFundraiserResultId, noteTextBunqMeFundraiserResultId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextBunqMeFundraiserResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -179,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextBunqMeFundraiserResult CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextBunqMeFundraiserResult>(json);
+            return BunqModel.CreateFromJsonString<NoteTextBunqMeFundraiserResult>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextDraftPayment.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextDraftPayment.cs
index 74794db..017bb57 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextDraftPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextDraftPayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,147 +23,127 @@ public class NoteTextDraftPayment : BunqModel
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/draft-payment/{2}/note-text/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/draft-payment/{2}/note-text";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/draft-payment/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int draftPaymentId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        draftPaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int draftPaymentId, int noteTextDraftPaymentId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        draftPaymentId, noteTextDraftPaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId, noteTextDraftPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int draftPaymentId, int noteTextDraftPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int draftPaymentId, int noteTextDraftPaymentId, int? 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),
-                        draftPaymentId, noteTextDraftPaymentId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId, noteTextDraftPaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextDraftPayment>> List(int draftPaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextDraftPayment>> List(int draftPaymentId, int? 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), draftPaymentId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextDraftPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextDraftPayment> Get(int draftPaymentId, int noteTextDraftPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextDraftPayment> Get(int draftPaymentId, int noteTextDraftPaymentId, int? 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),
-                        draftPaymentId, noteTextDraftPaymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), draftPaymentId, noteTextDraftPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextDraftPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -170,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextDraftPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextDraftPayment>(json);
+            return BunqModel.CreateFromJsonString<NoteTextDraftPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextIdealMerchantTransaction.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextIdealMerchantTransaction.cs
index 33042ca..374b090 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextIdealMerchantTransaction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextIdealMerchantTransaction.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,161 +18,132 @@ public class NoteTextIdealMerchantTransaction : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{2}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/ideal-merchant-transaction/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int idealMerchantTransactionId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        idealMerchantTransactionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int idealMerchantTransactionId, int noteTextIdealMerchantTransactionId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        idealMerchantTransactionId, noteTextIdealMerchantTransactionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId, noteTextIdealMerchantTransactionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int idealMerchantTransactionId,
-            int noteTextIdealMerchantTransactionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int idealMerchantTransactionId, int noteTextIdealMerchantTransactionId, int? 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),
-                        idealMerchantTransactionId, noteTextIdealMerchantTransactionId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId, noteTextIdealMerchantTransactionId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextIdealMerchantTransaction>> List(int idealMerchantTransactionId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextIdealMerchantTransaction>> List(int idealMerchantTransactionId, int? 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), idealMerchantTransactionId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextIdealMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextIdealMerchantTransaction> Get(int idealMerchantTransactionId,
-            int noteTextIdealMerchantTransactionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextIdealMerchantTransaction> Get(int idealMerchantTransactionId, int noteTextIdealMerchantTransactionId, int? 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),
-                    idealMerchantTransactionId, noteTextIdealMerchantTransactionId), new Dictionary<string, string>(),
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), idealMerchantTransactionId, noteTextIdealMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextIdealMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -179,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextIdealMerchantTransaction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextIdealMerchantTransaction>(json);
+            return BunqModel.CreateFromJsonString<NoteTextIdealMerchantTransaction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextMasterCardAction.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextMasterCardAction.cs
index 442c69c..48cd2f9 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextMasterCardAction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextMasterCardAction.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -17,155 +19,131 @@ public class NoteTextMasterCardAction : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-text/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/mastercard-action/{2}/note-text";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/mastercard-action/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int mastercardActionId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        mastercardActionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int mastercardActionId, int noteTextMasterCardActionId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        mastercardActionId, noteTextMasterCardActionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId, noteTextMasterCardActionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int mastercardActionId, int noteTextMasterCardActionId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int mastercardActionId, int noteTextMasterCardActionId, int? 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),
-                        mastercardActionId, noteTextMasterCardActionId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId, noteTextMasterCardActionId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextMasterCardAction>> List(int mastercardActionId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextMasterCardAction>> List(int mastercardActionId, int? 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), mastercardActionId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextMasterCardAction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextMasterCardAction> Get(int mastercardActionId, int noteTextMasterCardActionId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextMasterCardAction> Get(int mastercardActionId, int noteTextMasterCardActionId, int? 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),
-                        mastercardActionId, noteTextMasterCardActionId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), mastercardActionId, noteTextMasterCardActionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextMasterCardAction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -174,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextMasterCardAction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextMasterCardAction>(json);
+            return BunqModel.CreateFromJsonString<NoteTextMasterCardAction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextPayment.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextPayment.cs
index a44b47e..bab45d5 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextPayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,147 +23,127 @@ public class NoteTextPayment : BunqModel
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/payment/{2}/note-text/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment/{2}/note-text";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int paymentId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        paymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int paymentId, int noteTextPaymentId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        paymentId, noteTextPaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId, noteTextPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentId, int noteTextPaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int paymentId, int noteTextPaymentId, int? 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),
-                        paymentId, noteTextPaymentId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId, noteTextPaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextPayment>> List(int paymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextPayment>> List(int paymentId, int? 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), paymentId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextPayment> Get(int paymentId, int noteTextPaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextPayment> Get(int paymentId, int noteTextPaymentId, int? 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),
-                        paymentId, noteTextPaymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId, noteTextPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -170,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextPayment>(json);
+            return BunqModel.CreateFromJsonString<NoteTextPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentBatch.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentBatch.cs
index 27ecaeb..b4c810b 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextPaymentBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,147 +23,127 @@ public class NoteTextPaymentBatch : BunqModel
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/payment-batch/{2}/note-text/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-batch/{2}/note-text";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment-batch/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int paymentBatchId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        paymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int paymentBatchId, int noteTextPaymentBatchId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        paymentBatchId, noteTextPaymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId, noteTextPaymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentBatchId, int noteTextPaymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int paymentBatchId, int noteTextPaymentBatchId, int? 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),
-                        paymentBatchId, noteTextPaymentBatchId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId, noteTextPaymentBatchId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextPaymentBatch>> List(int paymentBatchId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextPaymentBatch>> List(int paymentBatchId, int? 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), paymentBatchId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextPaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextPaymentBatch> Get(int paymentBatchId, int noteTextPaymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextPaymentBatch> Get(int paymentBatchId, int noteTextPaymentBatchId, int? 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, noteTextPaymentBatchId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId, noteTextPaymentBatchId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextPaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -170,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextPaymentBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextPaymentBatch>(json);
+            return BunqModel.CreateFromJsonString<NoteTextPaymentBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiry.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiry.cs
index ba0046d..85e05c9 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiry.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiry.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,148 +23,127 @@ public class NoteTextRequestInquiry : BunqModel
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-text/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-inquiry/{2}/note-text";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-inquiry/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int requestInquiryId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestInquiryId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int requestInquiryId, int noteTextRequestInquiryId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestInquiryId, noteTextRequestInquiryId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId, noteTextRequestInquiryId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestInquiryId, int noteTextRequestInquiryId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int requestInquiryId, int noteTextRequestInquiryId, int? 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),
-                        requestInquiryId, noteTextRequestInquiryId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId, noteTextRequestInquiryId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextRequestInquiry>> List(int requestInquiryId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextRequestInquiry>> List(int requestInquiryId, int? 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), requestInquiryId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextRequestInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextRequestInquiry> Get(int requestInquiryId, int noteTextRequestInquiryId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextRequestInquiry> Get(int requestInquiryId, int noteTextRequestInquiryId, int? 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),
-                        requestInquiryId, noteTextRequestInquiryId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId, noteTextRequestInquiryId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextRequestInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -171,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextRequestInquiry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextRequestInquiry>(json);
+            return BunqModel.CreateFromJsonString<NoteTextRequestInquiry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryBatch.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryBatch.cs
index a3c9e3a..c0d3d1d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestInquiryBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,161 +18,132 @@ public class NoteTextRequestInquiryBatch : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-inquiry-batch/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int requestInquiryBatchId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestInquiryBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int requestInquiryBatchId, int noteTextRequestInquiryBatchId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestInquiryBatchId, noteTextRequestInquiryBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId, noteTextRequestInquiryBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestInquiryBatchId, int noteTextRequestInquiryBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int requestInquiryBatchId, int noteTextRequestInquiryBatchId, int? 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),
-                        requestInquiryBatchId, noteTextRequestInquiryBatchId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId, noteTextRequestInquiryBatchId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextRequestInquiryBatch>> List(int requestInquiryBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextRequestInquiryBatch>> List(int requestInquiryBatchId, int? 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), requestInquiryBatchId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextRequestInquiryBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextRequestInquiryBatch> Get(int requestInquiryBatchId,
-            int noteTextRequestInquiryBatchId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextRequestInquiryBatch> Get(int requestInquiryBatchId, int noteTextRequestInquiryBatchId, int? 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),
-                        requestInquiryBatchId, noteTextRequestInquiryBatchId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId, noteTextRequestInquiryBatchId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextRequestInquiryBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -179,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextRequestInquiryBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextRequestInquiryBatch>(json);
+            return BunqModel.CreateFromJsonString<NoteTextRequestInquiryBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestResponse.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestResponse.cs
index cb1e8e9..9305dd6 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextRequestResponse.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextRequestResponse.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,148 +23,127 @@ public class NoteTextRequestResponse : BunqModel
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/request-response/{2}/note-text/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-response/{2}/note-text";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-response/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int requestResponseId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestResponseId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int requestResponseId, int noteTextRequestResponseId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestResponseId, noteTextRequestResponseId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId, noteTextRequestResponseId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int requestResponseId, int noteTextRequestResponseId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int requestResponseId, int noteTextRequestResponseId, int? 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),
-                        requestResponseId, noteTextRequestResponseId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId, noteTextRequestResponseId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextRequestResponse>> List(int requestResponseId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextRequestResponse>> List(int requestResponseId, int? 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), requestResponseId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextRequestResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextRequestResponse> Get(int requestResponseId, int noteTextRequestResponseId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextRequestResponse> Get(int requestResponseId, int noteTextRequestResponseId, int? 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),
-                        requestResponseId, noteTextRequestResponseId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId, noteTextRequestResponseId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextRequestResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -171,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextRequestResponse CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextRequestResponse>(json);
+            return BunqModel.CreateFromJsonString<NoteTextRequestResponse>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleInstance.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleInstance.cs
index c1bcd68..61ab9c4 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleInstance.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextScheduleInstance.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,162 +18,132 @@ public class NoteTextScheduleInstance : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text/{4}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text/{4}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text/{4}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text/{4}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text/{4}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}/note-text/{4}";
+    
         /// <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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int scheduleId, int scheduleInstanceId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        scheduleId, scheduleInstanceId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int scheduleId, int scheduleInstanceId, int noteTextScheduleInstanceId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        scheduleId, scheduleInstanceId, noteTextScheduleInstanceId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId, noteTextScheduleInstanceId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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(int scheduleId, int scheduleInstanceId, int noteTextScheduleInstanceId, int? 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),
-                        scheduleId, scheduleInstanceId, noteTextScheduleInstanceId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId, noteTextScheduleInstanceId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextScheduleInstance>> List(int scheduleId, int scheduleInstanceId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextScheduleInstance>> List(int scheduleId, int scheduleInstanceId, int? 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), scheduleId, scheduleInstanceId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextScheduleInstance>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextScheduleInstance> Get(int scheduleId, int scheduleInstanceId,
-            int noteTextScheduleInstanceId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextScheduleInstance> Get(int scheduleId, int scheduleInstanceId, int noteTextScheduleInstanceId, int? 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),
-                        scheduleId, scheduleInstanceId, noteTextScheduleInstanceId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId, noteTextScheduleInstanceId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextScheduleInstance>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -180,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextScheduleInstance CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextScheduleInstance>(json);
+            return BunqModel.CreateFromJsonString<NoteTextScheduleInstance>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePayment.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePayment.cs
index 1fc90f1..52ec106 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,148 +23,127 @@ public class NoteTextSchedulePayment : BunqModel
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-text/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule-payment/{2}/note-text";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule-payment/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int schedulePaymentId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        schedulePaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int schedulePaymentId, int noteTextSchedulePaymentId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        schedulePaymentId, noteTextSchedulePaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId, noteTextSchedulePaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentId, int noteTextSchedulePaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int schedulePaymentId, int noteTextSchedulePaymentId, int? 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),
-                        schedulePaymentId, noteTextSchedulePaymentId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId, noteTextSchedulePaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextSchedulePayment>> List(int schedulePaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextSchedulePayment>> List(int schedulePaymentId, int? 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), schedulePaymentId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextSchedulePayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextSchedulePayment> Get(int schedulePaymentId, int noteTextSchedulePaymentId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextSchedulePayment> Get(int schedulePaymentId, int noteTextSchedulePaymentId, int? 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),
-                        schedulePaymentId, noteTextSchedulePaymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId, noteTextSchedulePaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextSchedulePayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -171,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextSchedulePayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextSchedulePayment>(json);
+            return BunqModel.CreateFromJsonString<NoteTextSchedulePayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentBatch.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentBatch.cs
index 34f8698..d21a721 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextSchedulePaymentBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,161 +18,132 @@ public class NoteTextSchedulePaymentBatch : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule-payment-batch/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int schedulePaymentBatchId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        schedulePaymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int schedulePaymentBatchId, int noteTextSchedulePaymentBatchId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        schedulePaymentBatchId, noteTextSchedulePaymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId, noteTextSchedulePaymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int noteTextSchedulePaymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int noteTextSchedulePaymentBatchId, int? 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),
-                        schedulePaymentBatchId, noteTextSchedulePaymentBatchId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId, noteTextSchedulePaymentBatchId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextSchedulePaymentBatch>> List(int schedulePaymentBatchId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextSchedulePaymentBatch>> List(int schedulePaymentBatchId, int? 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), schedulePaymentBatchId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextSchedulePaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextSchedulePaymentBatch> Get(int schedulePaymentBatchId,
-            int noteTextSchedulePaymentBatchId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextSchedulePaymentBatch> Get(int schedulePaymentBatchId, int noteTextSchedulePaymentBatchId, int? 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),
-                        schedulePaymentBatchId, noteTextSchedulePaymentBatchId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId, noteTextSchedulePaymentBatchId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextSchedulePaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -179,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextSchedulePaymentBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextSchedulePaymentBatch>(json);
+            return BunqModel.CreateFromJsonString<NoteTextSchedulePaymentBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextSofortMerchantTransaction.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextSofortMerchantTransaction.cs
index 7fb60cc..a24fbce 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextSofortMerchantTransaction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextSofortMerchantTransaction.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,161 +18,132 @@ public class NoteTextSofortMerchantTransaction : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text/{3}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int sofortMerchantTransactionId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        sofortMerchantTransactionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int sofortMerchantTransactionId, int noteTextSofortMerchantTransactionId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        sofortMerchantTransactionId, noteTextSofortMerchantTransactionId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId, noteTextSofortMerchantTransactionId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int sofortMerchantTransactionId,
-            int noteTextSofortMerchantTransactionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int sofortMerchantTransactionId, int noteTextSofortMerchantTransactionId, int? 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),
-                        sofortMerchantTransactionId, noteTextSofortMerchantTransactionId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId, noteTextSofortMerchantTransactionId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextSofortMerchantTransaction>> List(int sofortMerchantTransactionId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextSofortMerchantTransaction>> List(int sofortMerchantTransactionId, int? 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), sofortMerchantTransactionId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextSofortMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextSofortMerchantTransaction> Get(int sofortMerchantTransactionId,
-            int noteTextSofortMerchantTransactionId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextSofortMerchantTransaction> Get(int sofortMerchantTransactionId, int noteTextSofortMerchantTransactionId, int? 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),
-                    sofortMerchantTransactionId, noteTextSofortMerchantTransactionId), new Dictionary<string, string>(),
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId, noteTextSofortMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextSofortMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -179,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextSofortMerchantTransaction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextSofortMerchantTransaction>(json);
+            return BunqModel.CreateFromJsonString<NoteTextSofortMerchantTransaction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NoteTextWhitelistResult.cs b/BunqSdk/Model/Generated/Endpoint/NoteTextWhitelistResult.cs
index 51a05a5..5c40e7d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NoteTextWhitelistResult.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NoteTextWhitelistResult.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,161 +18,132 @@ public class NoteTextWhitelistResult : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text/{4}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text/{4}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text/{4}";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text/{4}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text/{4}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/whitelist/{2}/whitelist-result/{3}/note-text/{4}";
+    
         /// <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 int? 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 LabelUser LabelUserCreator { get; set; }
-
-
+    
+    
         /// <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<int> Create(int whitelistId, int whitelistResultId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        whitelistId, whitelistResultId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int whitelistId, int whitelistResultId, int noteTextWhitelistResultId, int? 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},
-            };
-
+    {
+    {FIELD_CONTENT, content},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        whitelistId, whitelistResultId, noteTextWhitelistResultId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId, noteTextWhitelistResultId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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(int whitelistId, int whitelistResultId, int noteTextWhitelistResultId, int? 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),
-                        whitelistId, whitelistResultId, noteTextWhitelistResultId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId, noteTextWhitelistResultId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Manage the notes for a given user.
         /// </summary>
-        public static BunqResponse<List<NoteTextWhitelistResult>> List(int whitelistId, int whitelistResultId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NoteTextWhitelistResult>> List(int whitelistId, int whitelistResultId, int? 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), whitelistId, whitelistResultId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId), urlParams, customHeaders);
+    
             return FromJsonList<NoteTextWhitelistResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<NoteTextWhitelistResult> Get(int whitelistId, int whitelistResultId,
-            int noteTextWhitelistResultId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NoteTextWhitelistResult> Get(int whitelistId, int whitelistResultId, int noteTextWhitelistResultId, int? 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),
-                        whitelistId, whitelistResultId, noteTextWhitelistResultId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), whitelistId, whitelistResultId, noteTextWhitelistResultId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<NoteTextWhitelistResult>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -179,35 +152,35 @@ public override bool IsAllFieldNull()
             {
                 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 NoteTextWhitelistResult CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NoteTextWhitelistResult>(json);
+            return BunqModel.CreateFromJsonString<NoteTextWhitelistResult>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NotificationFilterPushUser.cs b/BunqSdk/Model/Generated/Endpoint/NotificationFilterPushUser.cs
index 9351842..1a5149d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NotificationFilterPushUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NotificationFilterPushUser.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,62 +20,58 @@ public class NotificationFilterPushUser : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/notification-filter-push";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/notification-filter-push";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_NOTIFICATION_FILTERS = "notification_filters";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "NotificationFilterPush";
         private const string OBJECT_TYPE_GET = "NotificationFilterPush";
-
+    
         /// <summary>
         /// The types of notifications that will result in a push notification for this user.
         /// </summary>
         [JsonProperty(PropertyName = "notification_filters")]
         public List<NotificationFilterPush> NotificationFilters { get; set; }
-
+    
         /// <summary>
         /// </summary>
         /// <param name="notificationFilters">The types of notifications that will result in a push notification for this user.</param>
-        public static BunqResponse<NotificationFilterPushUser> Create(
-            List<NotificationFilterPush> notificationFilters = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<NotificationFilterPushUser> Create(List<NotificationFilterPush> notificationFilters = 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_NOTIFICATION_FILTERS, notificationFilters},
-            };
-
+    {
+    {FIELD_NOTIFICATION_FILTERS, notificationFilters},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return FromJson<NotificationFilterPushUser>(responseRaw, OBJECT_TYPE_POST);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NotificationFilterPushUser>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NotificationFilterPushUser>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<NotificationFilterPushUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -82,15 +80,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static NotificationFilterPushUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NotificationFilterPushUser>(json);
+            return BunqModel.CreateFromJsonString<NotificationFilterPushUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlMonetaryAccount.cs b/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlMonetaryAccount.cs
index 2bce420..8bcb115 100644
--- a/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlMonetaryAccount.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlMonetaryAccount.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,65 +20,57 @@ public class NotificationFilterUrlMonetaryAccount : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/notification-filter-url";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/notification-filter-url";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_NOTIFICATION_FILTERS = "notification_filters";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "NotificationFilterUrl";
-
+    
         /// <summary>
         /// The types of notifications that will result in a url notification for this monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "notification_filters")]
         public List<NotificationFilterUrl> NotificationFilters { get; set; }
-
+    
         /// <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<NotificationFilterUrl> notificationFilters = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int? monetaryAccountId= null, List<NotificationFilterUrl> notificationFilters = 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_NOTIFICATION_FILTERS, notificationFilters},
-            };
-
+    {
+    {FIELD_NOTIFICATION_FILTERS, notificationFilters},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NotificationFilterUrlMonetaryAccount>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NotificationFilterUrlMonetaryAccount>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<NotificationFilterUrlMonetaryAccount>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -85,15 +79,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static NotificationFilterUrlMonetaryAccount CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NotificationFilterUrlMonetaryAccount>(json);
+            return BunqModel.CreateFromJsonString<NotificationFilterUrlMonetaryAccount>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlUser.cs b/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlUser.cs
index abc821a..b7d3e1d 100644
--- a/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/NotificationFilterUrlUser.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,61 +20,57 @@ public class NotificationFilterUrlUser : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/notification-filter-url";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/notification-filter-url";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_NOTIFICATION_FILTERS = "notification_filters";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "NotificationFilterUrl";
-
+    
         /// <summary>
         /// The types of notifications that will result in a url notification for this user.
         /// </summary>
         [JsonProperty(PropertyName = "notification_filters")]
         public List<NotificationFilterUrl> NotificationFilters { get; set; }
-
+    
         /// <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<NotificationFilterUrl> notificationFilters = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(List<NotificationFilterUrl> notificationFilters = 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_NOTIFICATION_FILTERS, notificationFilters},
-            };
-
+    {
+    {FIELD_NOTIFICATION_FILTERS, notificationFilters},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<NotificationFilterUrlUser>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<NotificationFilterUrlUser>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<NotificationFilterUrlUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -81,15 +79,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static NotificationFilterUrlUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NotificationFilterUrlUser>(json);
+            return BunqModel.CreateFromJsonString<NotificationFilterUrlUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/OauthCallbackUrl.cs b/BunqSdk/Model/Generated/Endpoint/OauthCallbackUrl.cs
index 0868ee5..3a755c8 100644
--- a/BunqSdk/Model/Generated/Endpoint/OauthCallbackUrl.cs
+++ b/BunqSdk/Model/Generated/Endpoint/OauthCallbackUrl.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,115 +22,101 @@ public class OauthCallbackUrl : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/oauth-client/{1}/callback-url/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/oauth-client/{1}/callback-url";
         protected const string ENDPOINT_URL_DELETE = "user/{0}/oauth-client/{1}/callback-url/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_URL = "url";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "OauthCallbackUrl";
-
+    
         /// <summary>
         /// The URL for this callback.
         /// </summary>
         [JsonProperty(PropertyName = "url")]
         public string Url { get; set; }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<OauthCallbackUrl> Get(int oauthClientId, int oauthCallbackUrlId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<OauthCallbackUrl> Get(int oauthClientId, int oauthCallbackUrlId, 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(), oauthClientId, oauthCallbackUrlId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), oauthClientId, oauthCallbackUrlId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<OauthCallbackUrl>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <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<int> Create(int oauthClientId, string url, 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_URL, url},
-            };
-
+    {
+    {FIELD_URL, url},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), oauthClientId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), oauthClientId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int oauthClientId, int oauthCallbackUrlId, string url = 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_URL, url},
-            };
-
+    {
+    {FIELD_URL, url},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), oauthClientId, oauthCallbackUrlId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), oauthClientId, oauthCallbackUrlId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<OauthCallbackUrl>> List(int oauthClientId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<OauthCallbackUrl>> List(int 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), oauthClientId),
-                urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), oauthClientId), urlParams, customHeaders);
+    
             return FromJsonList<OauthCallbackUrl>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int oauthClientId, int oauthCallbackUrlId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int oauthClientId, int oauthCallbackUrlId, 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(), oauthClientId, oauthCallbackUrlId),
-                    customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), oauthClientId, oauthCallbackUrlId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -137,15 +125,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static OauthCallbackUrl CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<OauthCallbackUrl>(json);
+            return BunqModel.CreateFromJsonString<OauthCallbackUrl>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/OauthClient.cs b/BunqSdk/Model/Generated/Endpoint/OauthClient.cs
index 76d8475..b6dc804 100644
--- a/BunqSdk/Model/Generated/Endpoint/OauthClient.cs
+++ b/BunqSdk/Model/Generated/Endpoint/OauthClient.cs
@@ -1,9 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,120 +22,120 @@ public class OauthClient : BunqModel
         protected const string ENDPOINT_URL_CREATE = "user/{0}/oauth-client";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/oauth-client/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/oauth-client";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_STATUS = "status";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "OauthClient";
-
+    
         /// <summary>
         /// The status of the pack group, can be ACTIVE, CANCELLED or CANCELLED_PENDING.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// Id of the client.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
+        /// <summary>
+        /// The display name of this Oauth Client
+        /// </summary>
+        [JsonProperty(PropertyName = "display_name")]
+        public string DisplayName { get; set; }
+    
         /// <summary>
         /// The Client ID associated with this Oauth Client
         /// </summary>
         [JsonProperty(PropertyName = "client_id")]
         public string ClientId { get; set; }
-
+    
         /// <summary>
         /// Secret associated with this Oauth Client
         /// </summary>
         [JsonProperty(PropertyName = "secret")]
         public string Secret { get; set; }
-
+    
         /// <summary>
         /// The callback URLs which are bound to this Oauth Client
         /// </summary>
         [JsonProperty(PropertyName = "callback_url")]
         public List<OauthCallbackUrl> CallbackUrl { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public static BunqResponse<OauthClient> Get(int oauthClientId, 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(), oauthClientId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), oauthClientId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<OauthClient>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <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)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-
+    
             var requestMap = new Dictionary<string, object>
-            {
-                {FIELD_STATUS, status},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int oauthClientId, 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},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), oauthClientId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), oauthClientId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<OauthClient>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<OauthClient>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<OauthClient>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -141,35 +144,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
+            if (this.DisplayName != null)
+            {
+                return false;
+            }
+    
             if (this.ClientId != null)
             {
                 return false;
             }
-
+    
             if (this.Secret != null)
             {
                 return false;
             }
-
+    
             if (this.CallbackUrl != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static OauthClient CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<OauthClient>(json);
+            return BunqModel.CreateFromJsonString<OauthClient>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Payment.cs b/BunqSdk/Model/Generated/Endpoint/Payment.cs
index 70bbdd0..174dedd 100644
--- a/BunqSdk/Model/Generated/Endpoint/Payment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Payment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -22,7 +24,7 @@ public class Payment : BunqModel
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/payment";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -32,166 +34,172 @@ public class Payment : BunqModel
         public const string FIELD_ATTACHMENT = "attachment";
         public const string FIELD_MERCHANT_REFERENCE = "merchant_reference";
         public const string FIELD_ALLOW_BUNQTO = "allow_bunqto";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Payment";
-
+    
         /// <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).
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { 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 for the Payment. Maximum 140 characters for Payments to external IBANs, 9000 characters for
         /// Payments to only other bunq MonetaryAccounts.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The Attachments attached to the Payment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> Attachment { get; set; }
-
+    
         /// <summary>
         /// Optional data included with the Payment specific to the merchant.
         /// </summary>
         [JsonProperty(PropertyName = "merchant_reference")]
         public string MerchantReference { get; set; }
-
+    
         /// <summary>
         /// Whether or not sending a bunq.to payment is allowed.
         /// </summary>
         [JsonProperty(PropertyName = "allow_bunqto")]
         public bool? AllowBunqto { get; set; }
-
+    
         /// <summary>
         /// The id of the created Payment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the Payment was done.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the Payment was last updated (will be updated when chat messages are received).
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The id of the MonetaryAccount the Payment was made to or from (depending on whether this is an incoming or
         /// outgoing Payment).
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { 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 type of Payment, can be BUNQ, EBA_SCT, EBA_SDD, IDEAL, SWIFT or FIS (card).
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The sub-type of the Payment, can be PAYMENT, WITHDRAWAL, REVERSAL, REQUEST, BILLING, SCT, SDD or NLO.
         /// </summary>
         [JsonProperty(PropertyName = "sub_type")]
         public string SubType { get; set; }
-
+    
         /// <summary>
         /// The status of the bunq.to payment.
         /// </summary>
         [JsonProperty(PropertyName = "bunqto_status")]
         public string BunqtoStatus { get; set; }
-
+    
         /// <summary>
         /// The sub status of the bunq.to payment.
         /// </summary>
         [JsonProperty(PropertyName = "bunqto_sub_status")]
         public string BunqtoSubStatus { get; set; }
-
+    
         /// <summary>
         /// The status of the bunq.to payment.
         /// </summary>
         [JsonProperty(PropertyName = "bunqto_share_url")]
         public string BunqtoShareUrl { get; set; }
-
+    
         /// <summary>
         /// When bunq.to payment is about to expire.
         /// </summary>
         [JsonProperty(PropertyName = "bunqto_expiry")]
         public string BunqtoExpiry { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the bunq.to payment was responded to.
         /// </summary>
         [JsonProperty(PropertyName = "bunqto_time_responded")]
         public string BunqtoTimeResponded { get; set; }
-
+    
         /// <summary>
         /// The id of the PaymentBatch if this Payment was part of one.
         /// </summary>
         [JsonProperty(PropertyName = "batch_id")]
         public int? BatchId { get; set; }
-
+    
         /// <summary>
         /// The id of the JobScheduled if the Payment was scheduled.
         /// </summary>
         [JsonProperty(PropertyName = "scheduled_id")]
         public int? ScheduledId { get; set; }
-
+    
         /// <summary>
         /// A shipping Address provided with the Payment, currently unused.
         /// </summary>
         [JsonProperty(PropertyName = "address_shipping")]
         public Address AddressShipping { get; set; }
-
+    
         /// <summary>
         /// A billing Address provided with the Payment, currently unused.
         /// </summary>
         [JsonProperty(PropertyName = "address_billing")]
         public Address AddressBilling { get; set; }
-
+    
         /// <summary>
         /// The Geolocation where the Payment was done from.
         /// </summary>
         [JsonProperty(PropertyName = "geolocation")]
         public Geolocation Geolocation { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
         [JsonProperty(PropertyName = "request_reference_split_the_bill")]
         public List<RequestInquiryReference> RequestReferenceSplitTheBill { get; set; }
-
+    
         /// <summary>
         /// The new balance of the monetary account after the mutation.
         /// </summary>
         [JsonProperty(PropertyName = "balance_after_mutation")]
         public Amount BalanceAfterMutation { get; set; }
-
-
+    
+        /// <summary>
+        /// A reference to the PaymentAutoAllocateInstance if it exists.
+        /// </summary>
+        [JsonProperty(PropertyName = "payment_auto_allocate_instance")]
+        public PaymentAutoAllocateInstance PaymentAutoAllocateInstance { get; set; }
+    
+    
         /// <summary>
         /// Create a new Payment.
         /// </summary>
@@ -201,69 +209,56 @@ public class Payment : 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(Amount amount, Pointer counterpartyAlias, string description,
-            int? monetaryAccountId = null, List<AttachmentMonetaryAccountPayment> attachment = null,
-            string merchantReference = null, bool? allowBunqto = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(Amount amount, Pointer counterpartyAlias, string description, int? monetaryAccountId= null, List<AttachmentMonetaryAccountPayment> attachment = null, string merchantReference = null, bool? allowBunqto = 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_AMOUNT, amount},
-                {FIELD_COUNTERPARTY_ALIAS, counterpartyAlias},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_ATTACHMENT, attachment},
-                {FIELD_MERCHANT_REFERENCE, merchantReference},
-                {FIELD_ALLOW_BUNQTO, allowBunqto},
-            };
-
+    {
+    {FIELD_AMOUNT, amount},
+    {FIELD_COUNTERPARTY_ALIAS, counterpartyAlias},
+    {FIELD_DESCRIPTION, description},
+    {FIELD_ATTACHMENT, attachment},
+    {FIELD_MERCHANT_REFERENCE, merchantReference},
+    {FIELD_ALLOW_BUNQTO, allowBunqto},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a specific previous Payment.
         /// </summary>
-        public static BunqResponse<Payment> Get(int paymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<Payment> Get(int paymentId, int? 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),
-                        paymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Payment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a listing of all Payments performed on a given MonetaryAccount (incoming and outgoing).
         /// </summary>
-        public static BunqResponse<List<Payment>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Payment>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<Payment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -272,130 +267,135 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != 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.Type != null)
             {
                 return false;
             }
-
+    
             if (this.SubType != null)
             {
                 return false;
             }
-
+    
             if (this.BunqtoStatus != null)
             {
                 return false;
             }
-
+    
             if (this.BunqtoSubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.BunqtoShareUrl != null)
             {
                 return false;
             }
-
+    
             if (this.BunqtoExpiry != null)
             {
                 return false;
             }
-
+    
             if (this.BunqtoTimeResponded != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             if (this.MerchantReference != null)
             {
                 return false;
             }
-
+    
             if (this.BatchId != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduledId != null)
             {
                 return false;
             }
-
+    
             if (this.AddressShipping != null)
             {
                 return false;
             }
-
+    
             if (this.AddressBilling != null)
             {
                 return false;
             }
-
+    
             if (this.Geolocation != null)
             {
                 return false;
             }
-
+    
             if (this.RequestReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             if (this.BalanceAfterMutation != null)
             {
                 return false;
             }
-
+    
+            if (this.PaymentAutoAllocateInstance != null)
+            {
+                return false;
+            }
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Payment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Payment>(json);
+            return BunqModel.CreateFromJsonString<Payment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocate.cs b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocate.cs
index f74acf5..d5b2eff 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocate.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocate.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,177 +23,156 @@ public class PaymentAutoAllocate : BunqModel
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-auto-allocate";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/payment-auto-allocate/{2}";
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/payment-auto-allocate/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_PAYMENT_ID = "payment_id";
         public const string FIELD_TYPE = "type";
         public const string FIELD_DEFINITION = "definition";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "PaymentAutoAllocate";
-
+    
         /// <summary>
         /// 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; }
-
+    
         /// <summary>
         /// The type.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The definition of how the money should be allocated.
         /// </summary>
         [JsonProperty(PropertyName = "definition")]
         public List<PaymentAutoAllocateDefinition> Definition { get; set; }
-
+    
         /// <summary>
         /// The id of the PaymentAutoAllocate.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the PaymentAutoAllocate was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the PaymentAutoAllocate was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The status.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The amount on which this payment auto allocate will be triggered.
         /// </summary>
         [JsonProperty(PropertyName = "trigger_amount")]
         public Amount TriggerAmount { get; set; }
-
+    
         /// <summary>
         /// The payment that was used to define the triggers for this payment auto allocate.
         /// </summary>
         [JsonProperty(PropertyName = "payment")]
         public Payment Payment { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <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<PaymentAutoAllocateDefinition> definition, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int? paymentId, string type, List<PaymentAutoAllocateDefinition> definition, int? 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>
-            {
-                {FIELD_PAYMENT_ID, paymentId},
-                {FIELD_TYPE, type},
-                {FIELD_DEFINITION, definition},
-            };
-
+    {
+    {FIELD_PAYMENT_ID, paymentId},
+    {FIELD_TYPE, type},
+    {FIELD_DEFINITION, definition},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentAutoAllocate> Get(int paymentAutoAllocateId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentAutoAllocate> Get(int paymentAutoAllocateId, int? 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),
-                        paymentAutoAllocateId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentAutoAllocateId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<PaymentAutoAllocate>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PaymentAutoAllocate>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentAutoAllocate>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<PaymentAutoAllocate>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <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<PaymentAutoAllocateDefinition> definition = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int paymentAutoAllocateId, int? monetaryAccountId= null, List<PaymentAutoAllocateDefinition> definition = 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_DEFINITION, definition},
-            };
-
+    {
+    {FIELD_DEFINITION, definition},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        paymentAutoAllocateId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentAutoAllocateId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int paymentAutoAllocateId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int paymentAutoAllocateId, int? 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),
-                        paymentAutoAllocateId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentAutoAllocateId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -200,45 +181,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.TriggerAmount != null)
             {
                 return false;
             }
-
+    
             if (this.Payment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PaymentAutoAllocate CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PaymentAutoAllocate>(json);
+            return BunqModel.CreateFromJsonString<PaymentAutoAllocate>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateDefinition.cs b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateDefinition.cs
index 5e7a134..0a80725 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateDefinition.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateDefinition.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -14,9 +18,8 @@ public class PaymentAutoAllocateDefinition : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/payment-auto-allocate/{2}/definition";
-
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-auto-allocate/{2}/definition";
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -25,81 +28,75 @@ public class PaymentAutoAllocateDefinition : BunqModel
         public const string FIELD_DESCRIPTION = "description";
         public const string FIELD_AMOUNT = "amount";
         public const string FIELD_FRACTION = "fraction";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "PaymentAutoAllocateDefinition";
-
+    
         /// <summary>
         /// The type of definition.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The alias of the party we are allocating the money to.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The description for the payment.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The amount to allocate.
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { get; set; }
-
+    
         /// <summary>
         /// The percentage of the triggering payment's amount to allocate.
         /// </summary>
         [JsonProperty(PropertyName = "fraction")]
         public double? Fraction { get; set; }
-
+    
         /// <summary>
         /// The id of the PaymentAutoAllocateDefinition.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the PaymentAutoAllocateDefinition was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the PaymentAutoAllocateDefinition was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PaymentAutoAllocateDefinition>> List(int paymentAutoAllocateId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentAutoAllocateDefinition>> List(int paymentAutoAllocateId, int? 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), paymentAutoAllocateId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentAutoAllocateId), urlParams, customHeaders);
+    
             return FromJsonList<PaymentAutoAllocateDefinition>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -108,45 +105,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Amount != null)
             {
                 return false;
             }
-
+    
             if (this.Fraction != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PaymentAutoAllocateDefinition CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PaymentAutoAllocateDefinition>(json);
+            return BunqModel.CreateFromJsonString<PaymentAutoAllocateDefinition>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateInstance.cs b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateInstance.cs
index 458c030..cb704e7 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateInstance.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateInstance.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -14,103 +18,89 @@ public class PaymentAutoAllocateInstance : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/payment-auto-allocate/{2}/instance";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/payment-auto-allocate/{2}/instance/{3}";
-
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-auto-allocate/{2}/instance";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment-auto-allocate/{2}/instance/{3}";
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "PaymentAutoAllocateInstance";
-
+    
         /// <summary>
         /// The id of the PaymentAutoAllocateInstance.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the PaymentAutoAllocateInstance was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the PaymentAutoAllocateInstance was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The ID of the payment auto allocate this instance belongs to.
         /// </summary>
         [JsonProperty(PropertyName = "payment_auto_allocate_id")]
         public int? PaymentAutoAllocateId { get; set; }
-
+    
         /// <summary>
         /// The status of the payment auto allocate instance. SUCCEEDED or FAILED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The error message, if the payment auto allocating failed.
         /// </summary>
         [JsonProperty(PropertyName = "error_message")]
         public List<Error> ErrorMessage { get; set; }
-
+    
         /// <summary>
         /// The payment batch allocating all the payments.
         /// </summary>
         [JsonProperty(PropertyName = "payment_batch")]
         public PaymentBatch PaymentBatch { get; set; }
-
+    
         /// <summary>
         /// The ID of the payment that triggered the allocating of the payments.
         /// </summary>
         [JsonProperty(PropertyName = "payment_id")]
         public int? PaymentId { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PaymentAutoAllocateInstance>> List(int paymentAutoAllocateId,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentAutoAllocateInstance>> List(int paymentAutoAllocateId, int? 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), paymentAutoAllocateId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentAutoAllocateId), urlParams, customHeaders);
+    
             return FromJsonList<PaymentAutoAllocateInstance>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentAutoAllocateInstance> Get(int paymentAutoAllocateId,
-            int paymentAutoAllocateInstanceId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentAutoAllocateInstance> Get(int paymentAutoAllocateId, int paymentAutoAllocateInstanceId, int? 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),
-                        paymentAutoAllocateId, paymentAutoAllocateInstanceId), new Dictionary<string, string>(),
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentAutoAllocateId, paymentAutoAllocateInstanceId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<PaymentAutoAllocateInstance>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -119,50 +109,50 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.PaymentAutoAllocateId != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.ErrorMessage != null)
             {
                 return false;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return false;
             }
-
+    
             if (this.PaymentId != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PaymentAutoAllocateInstance CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PaymentAutoAllocateInstance>(json);
+            return BunqModel.CreateFromJsonString<PaymentAutoAllocateInstance>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateUser.cs b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateUser.cs
index 26394f4..4c99263 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentAutoAllocateUser.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,38 +19,36 @@ public class PaymentAutoAllocateUser : BunqModel, IAnchorObjectInterface
         /// 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_LISTING = "user/{0}/payment-auto-allocate";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "PaymentAutoAllocate";
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "PaymentAutoAllocate")]
         public PaymentAutoAllocate PaymentAutoAllocate { get; set; }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PaymentAutoAllocateUser>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentAutoAllocateUser>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<PaymentAutoAllocateUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -55,10 +57,10 @@ public BunqModel GetReferencedObject()
             {
                 return this.PaymentAutoAllocate;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -67,15 +69,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PaymentAutoAllocateUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PaymentAutoAllocateUser>(json);
+            return BunqModel.CreateFromJsonString<PaymentAutoAllocateUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentBatch.cs b/BunqSdk/Model/Generated/Endpoint/PaymentBatch.cs
index 0d252ff..ad448c8 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,107 +22,91 @@ public class PaymentBatch : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/payment-batch/{2}";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/payment-batch/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/payment-batch";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_PAYMENTS = "payments";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "PaymentBatch";
-
+    
         /// <summary>
         /// The list of mutations that were made.
         /// </summary>
         [JsonProperty(PropertyName = "payments")]
         public PaymentBatchAnchoredPayment Payments { 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<Payment> payments, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(List<Payment> payments, int? 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>
-            {
-                {FIELD_PAYMENTS, payments},
-            };
-
+    {
+    {FIELD_PAYMENTS, payments},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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)
+        public static BunqResponse<int> Update(int paymentBatchId, int? 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),
-                        paymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Return the details of a specific payment batch.
         /// </summary>
-        public static BunqResponse<PaymentBatch> Get(int paymentBatchId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentBatch> Get(int paymentBatchId, int? 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), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), paymentBatchId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<PaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Return all the payment batches for a monetary account.
         /// </summary>
-        public static BunqResponse<List<PaymentBatch>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentBatch>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<PaymentBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -129,15 +115,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PaymentBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PaymentBatch>(json);
+            return BunqModel.CreateFromJsonString<PaymentBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderCredential.cs b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderCredential.cs
index f8941f0..1d6602a 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderCredential.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderCredential.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,124 +20,118 @@ public class PaymentServiceProviderCredential : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "payment-service-provider-credential/{0}";
         protected const string ENDPOINT_URL_CREATE = "payment-service-provider-credential";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
-        public const string FIELD_CLIENT_PAYMENT_SERVICE_PROVIDER_CERTIFICATE =
-            "client_payment_service_provider_certificate";
-        public const string FIELD_CLIENT_PAYMENT_SERVICE_PROVIDER_CERTIFICATE_CHAIN =
-            "client_payment_service_provider_certificate_chain";
+        public const string FIELD_CLIENT_PAYMENT_SERVICE_PROVIDER_CERTIFICATE = "client_payment_service_provider_certificate";
+        public const string FIELD_CLIENT_PAYMENT_SERVICE_PROVIDER_CERTIFICATE_CHAIN = "client_payment_service_provider_certificate_chain";
         public const string FIELD_CLIENT_PUBLIC_KEY_SIGNATURE = "client_public_key_signature";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CredentialPasswordIp";
-
+    
         /// <summary>
         /// Payment Services Directive 2 compatible QSEAL certificate
         /// </summary>
         [JsonProperty(PropertyName = "client_payment_service_provider_certificate")]
         public string ClientPaymentServiceProviderCertificate { get; set; }
-
+    
         /// <summary>
         /// Intermediate and root certificate belonging to the provided certificate.
         /// </summary>
         [JsonProperty(PropertyName = "client_payment_service_provider_certificate_chain")]
         public string ClientPaymentServiceProviderCertificateChain { get; set; }
-
+    
         /// <summary>
         /// 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.
         /// </summary>
         [JsonProperty(PropertyName = "client_public_key_signature")]
         public string ClientPublicKeySignature { get; set; }
-
+    
         /// <summary>
         /// The id of the credential.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the credential object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the credential object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The status of the credential.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// When the status is PENDING_FIRST_USE: when the credential expires.
         /// </summary>
         [JsonProperty(PropertyName = "expiry_time")]
         public string ExpiryTime { get; set; }
-
+    
         /// <summary>
         /// When the status is PENDING_FIRST_USE: the value of the token.
         /// </summary>
         [JsonProperty(PropertyName = "token_value")]
         public string TokenValue { get; set; }
-
+    
         /// <summary>
         /// When the status is ACTIVE: the details of the device that may use the credential.
         /// </summary>
         [JsonProperty(PropertyName = "permitted_device")]
         public PermittedDevice PermittedDevice { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentServiceProviderCredential> Get(int paymentServiceProviderCredentialId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentServiceProviderCredential> Get(int paymentServiceProviderCredentialId, 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, paymentServiceProviderCredentialId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, paymentServiceProviderCredentialId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<PaymentServiceProviderCredential>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
         /// <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<int> Create(string clientPaymentServiceProviderCertificate, string clientPaymentServiceProviderCertificateChain, string clientPublicKeySignature, 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_CLIENT_PAYMENT_SERVICE_PROVIDER_CERTIFICATE, clientPaymentServiceProviderCertificate},
-                {FIELD_CLIENT_PAYMENT_SERVICE_PROVIDER_CERTIFICATE_CHAIN, clientPaymentServiceProviderCertificateChain},
-                {FIELD_CLIENT_PUBLIC_KEY_SIGNATURE, clientPublicKeySignature},
-            };
-
+    {
+    {FIELD_CLIENT_PAYMENT_SERVICE_PROVIDER_CERTIFICATE, clientPaymentServiceProviderCertificate},
+    {FIELD_CLIENT_PAYMENT_SERVICE_PROVIDER_CERTIFICATE_CHAIN, clientPaymentServiceProviderCertificateChain},
+    {FIELD_CLIENT_PUBLIC_KEY_SIGNATURE, clientPublicKeySignature},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
             var responseRaw = apiClient.Post(ENDPOINT_URL_CREATE, requestBytes, customHeaders);
-
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -144,45 +140,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.ExpiryTime != null)
             {
                 return false;
             }
-
+    
             if (this.TokenValue != null)
             {
                 return false;
             }
-
+    
             if (this.PermittedDevice != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PaymentServiceProviderCredential CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PaymentServiceProviderCredential>(json);
+            return BunqModel.CreateFromJsonString<PaymentServiceProviderCredential>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderDraftPayment.cs b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderDraftPayment.cs
index 3b7ec8d..53ddaa1 100644
--- a/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderDraftPayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PaymentServiceProviderDraftPayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +22,7 @@ public class PaymentServiceProviderDraftPayment : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/payment-service-provider-draft-payment/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/payment-service-provider-draft-payment";
         protected const string ENDPOINT_URL_READ = "user/{0}/payment-service-provider-draft-payment/{1}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -31,61 +33,61 @@ public class PaymentServiceProviderDraftPayment : BunqModel
         public const string FIELD_DESCRIPTION = "description";
         public const string FIELD_AMOUNT = "amount";
         public const string FIELD_STATUS = "status";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "PaymentServiceProviderDraftPayment";
-
+    
         /// <summary>
         /// The sender IBAN.
         /// </summary>
         [JsonProperty(PropertyName = "sender_iban")]
         public string SenderIban { get; set; }
-
+    
         /// <summary>
         /// The name of the sender.
         /// </summary>
         [JsonProperty(PropertyName = "sender_name")]
         public string SenderName { get; set; }
-
+    
         /// <summary>
         /// The IBAN of the counterparty.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_iban")]
         public string CounterpartyIban { get; set; }
-
+    
         /// <summary>
         /// The name of the counterparty.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_name")]
         public string CounterpartyName { get; set; }
-
+    
         /// <summary>
         /// Description of the payment.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The amount of the draft payment
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { get; set; }
-
+    
         /// <summary>
         /// The status of the draft payment
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The sender IBAN.
         /// </summary>
         [JsonProperty(PropertyName = "receiver_iban")]
         public string ReceiverIban { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="senderIban">The IBAN of the sender.</param>
@@ -95,87 +97,75 @@ public class PaymentServiceProviderDraftPayment : 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, Amount amount, string senderName = null, string status = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(string senderIban, string counterpartyIban, string counterpartyName, string description, Amount amount, string senderName = 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_SENDER_IBAN, senderIban},
-                {FIELD_SENDER_NAME, senderName},
-                {FIELD_COUNTERPARTY_IBAN, counterpartyIban},
-                {FIELD_COUNTERPARTY_NAME, counterpartyName},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_AMOUNT, amount},
-                {FIELD_STATUS, status},
-            };
-
+    {
+    {FIELD_SENDER_IBAN, senderIban},
+    {FIELD_SENDER_NAME, senderName},
+    {FIELD_COUNTERPARTY_IBAN, counterpartyIban},
+    {FIELD_COUNTERPARTY_NAME, counterpartyName},
+    {FIELD_DESCRIPTION, description},
+    {FIELD_AMOUNT, amount},
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <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<int> Update(int paymentServiceProviderDraftPaymentId, 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},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), paymentServiceProviderDraftPaymentId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), paymentServiceProviderDraftPaymentId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PaymentServiceProviderDraftPayment>> List(
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PaymentServiceProviderDraftPayment>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<PaymentServiceProviderDraftPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<PaymentServiceProviderDraftPayment> Get(int paymentServiceProviderDraftPaymentId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PaymentServiceProviderDraftPayment> Get(int paymentServiceProviderDraftPaymentId, 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(), paymentServiceProviderDraftPaymentId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), paymentServiceProviderDraftPaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<PaymentServiceProviderDraftPayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -184,30 +174,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ReceiverIban != null)
             {
                 return false;
             }
-
+    
             if (this.Amount != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PaymentServiceProviderDraftPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PaymentServiceProviderDraftPayment>(json);
+            return BunqModel.CreateFromJsonString<PaymentServiceProviderDraftPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PermittedIp.cs b/BunqSdk/Model/Generated/Endpoint/PermittedIp.cs
index 79b88ad..88bc1ef 100644
--- a/BunqSdk/Model/Generated/Endpoint/PermittedIp.cs
+++ b/BunqSdk/Model/Generated/Endpoint/PermittedIp.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,114 +21,100 @@ public class PermittedIp : BunqModel
         protected const string ENDPOINT_URL_CREATE = "user/{0}/credential-password-ip/{1}/ip";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/credential-password-ip/{1}/ip";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/credential-password-ip/{1}/ip/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_IP = "ip";
         public const string FIELD_STATUS = "status";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "PermittedIp";
-
+    
         /// <summary>
         /// The IP address.
         /// </summary>
         [JsonProperty(PropertyName = "ip")]
         public string Ip { get; set; }
-
+    
         /// <summary>
         /// 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.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<PermittedIp> Get(int credentialPasswordIpId, int permittedIpId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<PermittedIp> Get(int credentialPasswordIpId, int permittedIpId, 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(), credentialPasswordIpId, permittedIpId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), credentialPasswordIpId, permittedIpId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<PermittedIp>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </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<int> Create(int credentialPasswordIpId, string ip, 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_IP, ip},
-                {FIELD_STATUS, status},
-            };
-
+    {
+    {FIELD_IP, ip},
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), credentialPasswordIpId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), credentialPasswordIpId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<PermittedIp>> List(int credentialPasswordIpId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<PermittedIp>> List(int 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw =
-                apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), credentialPasswordIpId), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), credentialPasswordIpId), urlParams, customHeaders);
+    
             return FromJsonList<PermittedIp>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <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<int> Update(int credentialPasswordIpId, int permittedIpId, 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},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), credentialPasswordIpId, permittedIpId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), credentialPasswordIpId, permittedIpId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -135,20 +123,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PermittedIp CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PermittedIp>(json);
+            return BunqModel.CreateFromJsonString<PermittedIp>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/PlacePhotoLookupContent.cs b/BunqSdk/Model/Generated/Endpoint/PlacePhotoLookupContent.cs
new file mode 100644
index 0000000..35e0f00
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/PlacePhotoLookupContent.cs
@@ -0,0 +1,54 @@
+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>
+    /// View endpoint for place opening periods.
+    /// </summary>
+    public class PlacePhotoLookupContent : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_LISTING = "place-lookup/{0}/photo/{1}/content";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "PlacePhotoLookupContent";
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<byte[]> List(int placeLookupId, int photoId, 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_LISTING, placeLookupId, photoId), new Dictionary<string, string>(), customHeaders);
+    
+            return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static PlacePhotoLookupContent CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<PlacePhotoLookupContent>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Registry.cs b/BunqSdk/Model/Generated/Endpoint/Registry.cs
deleted file mode 100644
index 2ba9c31..0000000
--- a/BunqSdk/Model/Generated/Endpoint/Registry.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-using System.Collections.Generic;
-using System.Text;
-using Bunq.Sdk.Http;
-using Bunq.Sdk.Json;
-using Bunq.Sdk.Model.Core;
-using Bunq.Sdk.Model.Generated.Object;
-using Newtonsoft.Json;
-
-namespace Bunq.Sdk.Model.Generated.Endpoint
-{
-    /// <summary>
-    /// Used to manage Slice groups.
-    /// </summary>
-    public class Registry : BunqModel
-    {
-        /// <summary>
-        /// Endpoint constants.
-        /// </summary>
-        protected const string ENDPOINT_URL_CREATE = "user/{0}/registry";
-        protected const string ENDPOINT_URL_UPDATE = "user/{0}/registry/{1}";
-        protected const string ENDPOINT_URL_LISTING = "user/{0}/registry";
-        protected const string ENDPOINT_URL_READ = "user/{0}/registry/{1}";
-        protected const string ENDPOINT_URL_DELETE = "user/{0}/registry/{1}";
-
-        /// <summary>
-        /// Field constants.
-        /// </summary>
-        public const string FIELD_CURRENCY = "currency";
-        public const string FIELD_TITLE = "title";
-        public const string FIELD_DESCRIPTION = "description";
-        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_MEMBERSHIPS = "memberships";
-        public const string FIELD_MEMBERSHIPS_PREVIOUS = "memberships_previous";
-
-        /// <summary>
-        /// Object type.
-        /// </summary>
-        private const string OBJECT_TYPE_GET = "Registry";
-
-        /// <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 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 int? 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>
-        /// List of memberships to replace the current one.
-        /// </summary>
-        [JsonProperty(PropertyName = "memberships")]
-        public List<RegistryMembership> Memberships { get; set; }
-
-        /// <summary>
-        /// Previous list of memberships.
-        /// </summary>
-        [JsonProperty(PropertyName = "memberships_previous")]
-        public List<RegistryMembership> MembershipsPrevious { get; set; }
-
-        /// <summary>
-        /// The id of the Registry.
-        /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
-
-        /// <summary>
-        /// The timestamp of the Registry's creation.
-        /// </summary>
-        [JsonProperty(PropertyName = "created")]
-        public string Created { get; set; }
-
-        /// <summary>
-        /// The timestamp of the Registry's last update.
-        /// </summary>
-        [JsonProperty(PropertyName = "updated")]
-        public string Updated { get; set; }
-
-        /// <summary>
-        /// The number of RegistryEntries in this Registry that the user has not seen.
-        /// </summary>
-        [JsonProperty(PropertyName = "unseen_entries_count")]
-        public int? UnseenEntriesCount { get; set; }
-
-        /// <summary>
-        /// The total amount spent in this Registry since the last settlement.
-        /// </summary>
-        [JsonProperty(PropertyName = "total_amount_spent")]
-        public Amount TotalAmountSpent { get; set; }
-
-        /// <summary>
-        /// Whether the Registry has previously been settled.
-        /// </summary>
-        [JsonProperty(PropertyName = "is_previously_settled")]
-        public bool? IsPreviouslySettled { get; set; }
-
-        /// <summary>
-        /// The settings for this Registry.
-        /// </summary>
-        [JsonProperty(PropertyName = "setting")]
-        public RegistrySetting Setting { get; set; }
-
-        /// <summary>
-        /// The ID of the registry that currently has auto_add_card_transaction set to ALL.
-        /// </summary>
-        [JsonProperty(PropertyName = "registry_auto_add_card_transaction_enabled_id")]
-        public int? RegistryAutoAddCardTransactionEnabledId { get; set; }
-
-
-        /// <summary>
-        /// Create a new Slice group.
-        /// </summary>
-        /// <param name="currency">The currency for the Registry as an ISO 4217 formatted currency code.</param>
-        /// <param name="title">The title of the Registry.</param>
-        /// <param name="description">A description about the Registry.</param>
-        /// <param name="status">The status of the Registry.</param>
-        /// <param name="lastRegistryEntrySeenId">The id of the last RegistryEntry that the user has seen.</param>
-        /// <param name="previousUpdatedTimestamp">The previous updated timestamp that you received for this Registry.</param>
-        /// <param name="memberships">New list of memberships.</param>
-        /// <param name="membershipsPrevious">Previous list of memberships.</param>
-        public static BunqResponse<int> Create(string currency, string title = null, string description = null,
-            string status = null, int? lastRegistryEntrySeenId = null, string previousUpdatedTimestamp = null,
-            List<RegistryMembership> memberships = null, List<RegistryMembership> membershipsPrevious = 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_CURRENCY, currency},
-                {FIELD_TITLE, title},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_STATUS, status},
-                {FIELD_LAST_REGISTRY_ENTRY_SEEN_ID, lastRegistryEntrySeenId},
-                {FIELD_PREVIOUS_UPDATED_TIMESTAMP, previousUpdatedTimestamp},
-                {FIELD_MEMBERSHIPS, memberships},
-                {FIELD_MEMBERSHIPS_PREVIOUS, membershipsPrevious},
-            };
-
-            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
-            return ProcessForId(responseRaw);
-        }
-
-        /// <summary>
-        /// Update a specific Slice group.
-        /// </summary>
-        /// <param name="title">The title of the Registry.</param>
-        /// <param name="description">A description about the Registry.</param>
-        /// <param name="status">The status of the Registry.</param>
-        /// <param name="lastRegistryEntrySeenId">The id of the last RegistryEntry that the user has seen.</param>
-        /// <param name="previousUpdatedTimestamp">The previous updated timestamp that you received for this Registry.</param>
-        /// <param name="memberships">New list of memberships.</param>
-        /// <param name="membershipsPrevious">Previous list of memberships.</param>
-        public static BunqResponse<int> Update(int registryId, string title = null, string description = null,
-            string status = null, int? lastRegistryEntrySeenId = null, string previousUpdatedTimestamp = null,
-            List<RegistryMembership> memberships = null, List<RegistryMembership> membershipsPrevious = 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_TITLE, title},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_STATUS, status},
-                {FIELD_LAST_REGISTRY_ENTRY_SEEN_ID, lastRegistryEntrySeenId},
-                {FIELD_PREVIOUS_UPDATED_TIMESTAMP, previousUpdatedTimestamp},
-                {FIELD_MEMBERSHIPS, memberships},
-                {FIELD_MEMBERSHIPS_PREVIOUS, membershipsPrevious},
-            };
-
-            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), registryId),
-                requestBytes, customHeaders);
-
-            return ProcessForId(responseRaw);
-        }
-
-        /// <summary>
-        /// Get a listing of all Slice groups.
-        /// </summary>
-        public static BunqResponse<List<Registry>> List(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()), urlParams,
-                customHeaders);
-
-            return FromJsonList<Registry>(responseRaw, OBJECT_TYPE_GET);
-        }
-
-        /// <summary>
-        /// Get a specific Slice group.
-        /// </summary>
-        public static BunqResponse<Registry> Get(int registryId, 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(), registryId),
-                new Dictionary<string, string>(), customHeaders);
-
-            return FromJson<Registry>(responseRaw, OBJECT_TYPE_GET);
-        }
-
-        /// <summary>
-        /// Delete a specific Slice group.
-        /// </summary>
-        public static BunqResponse<object> Delete(int registryId, 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(), registryId),
-                customHeaders);
-
-            return new BunqResponse<object>(null, responseRaw.Headers);
-        }
-
-
-        /// <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.Currency != null)
-            {
-                return false;
-            }
-
-            if (this.Title != null)
-            {
-                return false;
-            }
-
-            if (this.Status != null)
-            {
-                return false;
-            }
-
-            if (this.UnseenEntriesCount != null)
-            {
-                return false;
-            }
-
-            if (this.TotalAmountSpent != null)
-            {
-                return false;
-            }
-
-            if (this.IsPreviouslySettled != null)
-            {
-                return false;
-            }
-
-            if (this.Memberships != null)
-            {
-                return false;
-            }
-
-            if (this.Setting != null)
-            {
-                return false;
-            }
-
-            if (this.RegistryAutoAddCardTransactionEnabledId != null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// </summary>
-        public static Registry CreateFromJsonString(string json)
-        {
-            return CreateFromJsonString<Registry>(json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistryEntry.cs b/BunqSdk/Model/Generated/Endpoint/RegistryEntry.cs
deleted file mode 100644
index c100531..0000000
--- a/BunqSdk/Model/Generated/Endpoint/RegistryEntry.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-using System.Collections.Generic;
-using System.Text;
-using Bunq.Sdk.Http;
-using Bunq.Sdk.Json;
-using Bunq.Sdk.Model.Core;
-using Bunq.Sdk.Model.Generated.Object;
-using Newtonsoft.Json;
-
-namespace Bunq.Sdk.Model.Generated.Endpoint
-{
-    /// <summary>
-    /// Used to manage Slice group payment.
-    /// </summary>
-    public class RegistryEntry : BunqModel
-    {
-        /// <summary>
-        /// Endpoint constants.
-        /// </summary>
-        protected const string ENDPOINT_URL_CREATE = "user/{0}/registry/{1}/registry-entry";
-        protected const string ENDPOINT_URL_UPDATE = "user/{0}/registry/{1}/registry-entry/{2}";
-        protected const string ENDPOINT_URL_LISTING = "user/{0}/registry/{1}/registry-entry";
-        protected const string ENDPOINT_URL_READ = "user/{0}/registry/{1}/registry-entry/{2}";
-        protected const string ENDPOINT_URL_DELETE = "user/{0}/registry/{1}/registry-entry/{2}";
-
-        /// <summary>
-        /// Field constants.
-        /// </summary>
-        public const string FIELD_ALIAS_OWNER = "alias_owner";
-        public const string FIELD_AMOUNT = "amount";
-        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";
-
-        /// <summary>
-        /// Object type.
-        /// </summary>
-        private const string OBJECT_TYPE_GET = "RegistryEntry";
-
-        /// <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 Amount Amount { get; set; }
-
-        /// <summary>
-        /// The object linked to the RegistryEntry.
-        /// </summary>
-        [JsonProperty(PropertyName = "object_reference")]
-        public RegistryEntryReference 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<AllocationItem> Allocations { get; set; }
-
-        /// <summary>
-        /// The attachments attached to the payment.
-        /// </summary>
-        [JsonProperty(PropertyName = "attachment")]
-        public List<RegistryEntryAttachment> Attachment { get; set; }
-
-        /// <summary>
-        /// The id of the RegistryEntry.
-        /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
-
-        /// <summary>
-        /// The timestamp of the MonetaryAccountBank's creation.
-        /// </summary>
-        [JsonProperty(PropertyName = "created")]
-        public string Created { get; set; }
-
-        /// <summary>
-        /// The timestamp of the MonetaryAccountBank's last update.
-        /// </summary>
-        [JsonProperty(PropertyName = "updated")]
-        public string Updated { get; set; }
-
-        /// <summary>
-        /// The id of the Registry.
-        /// </summary>
-        [JsonProperty(PropertyName = "registry_id")]
-        public int? RegistryId { get; set; }
-
-        /// <summary>
-        /// The status of the RegistryEntry.
-        /// </summary>
-        [JsonProperty(PropertyName = "status")]
-        public string Status { 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 LabelUser Alias { get; set; }
-
-        /// <summary>
-        /// The LabelUser with the public information of the counter party of this RegistryEntry.
-        /// </summary>
-        [JsonProperty(PropertyName = "counterparty_alias")]
-        public LabelUser CounterpartyAlias { get; set; }
-
-        /// <summary>
-        /// The LabelUser with the public information of the User that created the RegistryEntry.
-        /// </summary>
-        [JsonProperty(PropertyName = "user_alias_created")]
-        public LabelUser UserAliasCreated { get; set; }
-
-        /// <summary>
-        /// The membership of the creator.
-        /// </summary>
-        [JsonProperty(PropertyName = "membership_created")]
-        public RegistryMembership MembershipCreated { get; set; }
-
-        /// <summary>
-        /// The membership of the owner.
-        /// </summary>
-        [JsonProperty(PropertyName = "membership_owned")]
-        public RegistryMembership MembershipOwned { get; set; }
-
-
-        /// <summary>
-        /// Create a new Slice group payment.
-        /// </summary>
-        /// <param name="amount">The Amount of the RegistryEntry.</param>
-        /// <param name="allocations">An array of AllocationItems.</param>
-        /// <param name="aliasOwner">The Alias of the party we are allocating money for.</param>
-        /// <param name="objectReference">The object linked to the RegistryEntry.</param>
-        /// <param name="description">A description about the RegistryEntry.</param>
-        /// <param name="attachment">The attachments attached to the payment.</param>
-        public static BunqResponse<int> Create(int registryId, Amount amount, List<AllocationItem> allocations,
-            Pointer aliasOwner = null, RegistryEntryReference objectReference = null, string description = null,
-            List<RegistryEntryAttachment> attachment = 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_ALIAS_OWNER, aliasOwner},
-                {FIELD_AMOUNT, amount},
-                {FIELD_OBJECT_REFERENCE, objectReference},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_ALLOCATIONS, allocations},
-                {FIELD_ATTACHMENT, attachment},
-            };
-
-            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), registryId),
-                requestBytes, customHeaders);
-
-            return ProcessForId(responseRaw);
-        }
-
-        /// <summary>
-        /// Update a specific Slice group payment.
-        /// </summary>
-        /// <param name="description">A description about the RegistryEntry.</param>
-        /// <param name="allocations">An array of AllocationItems.</param>
-        /// <param name="attachment">The attachments attached to the payment.</param>
-        public static BunqResponse<int> Update(int registryId, int registryEntryId, string description = null,
-            List<AllocationItem> allocations = null, List<RegistryEntryAttachment> attachment = 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_ALLOCATIONS, allocations},
-                {FIELD_ATTACHMENT, attachment},
-            };
-
-            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), registryId, registryEntryId),
-                    requestBytes, customHeaders);
-
-            return ProcessForId(responseRaw);
-        }
-
-        /// <summary>
-        /// Get a listing of all Slice group payments.
-        /// </summary>
-        public static BunqResponse<List<RegistryEntry>> List(int registryId,
-            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(), registryId),
-                urlParams, customHeaders);
-
-            return FromJsonList<RegistryEntry>(responseRaw, OBJECT_TYPE_GET);
-        }
-
-        /// <summary>
-        /// Get a specific Slice group payment.
-        /// </summary>
-        public static BunqResponse<RegistryEntry> Get(int registryId, int registryEntryId,
-            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(), registryId, registryEntryId),
-                    new Dictionary<string, string>(), customHeaders);
-
-            return FromJson<RegistryEntry>(responseRaw, OBJECT_TYPE_GET);
-        }
-
-        /// <summary>
-        /// Delete a specific Slice group payment.
-        /// </summary>
-        public static BunqResponse<object> Delete(int registryId, int registryEntryId,
-            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(), registryId, registryEntryId),
-                    customHeaders);
-
-            return new BunqResponse<object>(null, responseRaw.Headers);
-        }
-
-
-        /// <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.RegistryId != null)
-            {
-                return false;
-            }
-
-            if (this.Status != null)
-            {
-                return false;
-            }
-
-            if (this.Amount != null)
-            {
-                return false;
-            }
-
-            if (this.Description != null)
-            {
-                return false;
-            }
-
-            if (this.Type != 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;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// </summary>
-        public static RegistryEntry CreateFromJsonString(string json)
-        {
-            return CreateFromJsonString<RegistryEntry>(json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistryMembership.cs b/BunqSdk/Model/Generated/Endpoint/RegistryMembership.cs
index 6ad6614..06d5453 100644
--- a/BunqSdk/Model/Generated/Endpoint/RegistryMembership.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RegistryMembership.cs
@@ -1,6 +1,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -14,33 +15,65 @@ public class RegistryMembership : BunqModel
         /// </summary>
         public const string FIELD_ALIAS = "alias";
         public const string FIELD_STATUS = "status";
-
-
+        public const string FIELD_AUTO_ADD_CARD_TRANSACTION = "auto_add_card_transaction";
+    
+    
         /// <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 for adding automatically card transactions to the registry.
+        /// </summary>
+        [JsonProperty(PropertyName = "auto_add_card_transaction")]
+        public string AutoAddCardTransaction { get; set; }
+    
         /// <summary>
         /// The balance of this RegistryMembership.
         /// </summary>
         [JsonProperty(PropertyName = "balance")]
         public Amount Balance { get; set; }
-
+    
         /// <summary>
         /// The total amount spent of this RegistryMembership.
         /// </summary>
         [JsonProperty(PropertyName = "total_amount_spent")]
         public Amount 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 int? RegistryId { get; set; }
+    
+        /// <summary>
+        /// The registry title.
+        /// </summary>
+        [JsonProperty(PropertyName = "registry_title")]
+        public string RegistryTitle { get; set; }
+    
+        /// <summary>
+        /// The label of the user that sent the invite.
+        /// </summary>
+        [JsonProperty(PropertyName = "invitor")]
+        public LabelUser Invitor { get; set; }
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -49,30 +82,55 @@ public override bool IsAllFieldNull()
             {
                 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.RegistryId != null)
+            {
+                return false;
+            }
+    
+            if (this.RegistryTitle != null)
+            {
+                return false;
+            }
+    
+            if (this.Invitor != null)
+            {
+                return false;
+            }
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RegistryMembership CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RegistryMembership>(json);
+            return BunqModel.CreateFromJsonString<RegistryMembership>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistrySetting.cs b/BunqSdk/Model/Generated/Endpoint/RegistrySetting.cs
deleted file mode 100644
index e816ba5..0000000
--- a/BunqSdk/Model/Generated/Endpoint/RegistrySetting.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-using System.Collections.Generic;
-using System.Text;
-using Bunq.Sdk.Http;
-using Bunq.Sdk.Json;
-using Bunq.Sdk.Model.Core;
-using Newtonsoft.Json;
-
-namespace Bunq.Sdk.Model.Generated.Endpoint
-{
-    /// <summary>
-    /// Used to manage Slice group settings.
-    /// </summary>
-    public class RegistrySetting : BunqModel
-    {
-        /// <summary>
-        /// Endpoint constants.
-        /// </summary>
-        protected const string ENDPOINT_URL_UPDATE = "user/{0}/registry/{1}/registry-setting/{2}";
-        protected const string ENDPOINT_URL_READ = "user/{0}/registry/{1}/registry-setting/{2}";
-
-        /// <summary>
-        /// Field constants.
-        /// </summary>
-        public const string FIELD_AUTO_ADD_CARD_TRANSACTION = "auto_add_card_transaction";
-
-        /// <summary>
-        /// Object type.
-        /// </summary>
-        private const string OBJECT_TYPE_GET = "RegistrySetting";
-
-        /// <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>
-        /// Update a specific Slice group setting.
-        /// </summary>
-        /// <param name="autoAddCardTransaction">The setting for for adding automatically card transactions to the registry.</param>
-        public static BunqResponse<int> Update(int registryId, int registrySettingId,
-            string autoAddCardTransaction = 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_AUTO_ADD_CARD_TRANSACTION, autoAddCardTransaction},
-            };
-
-            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), registryId, registrySettingId),
-                    requestBytes, customHeaders);
-
-            return ProcessForId(responseRaw);
-        }
-
-        /// <summary>
-        /// Get a specific Slice group setting.
-        /// </summary>
-        public static BunqResponse<RegistrySetting> Get(int registryId, int registrySettingId,
-            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(), registryId, registrySettingId),
-                    new Dictionary<string, string>(), customHeaders);
-
-            return FromJson<RegistrySetting>(responseRaw, OBJECT_TYPE_GET);
-        }
-
-
-        /// <summary>
-        /// </summary>
-        public override bool IsAllFieldNull()
-        {
-            if (this.AutoAddCardTransaction != null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// </summary>
-        public static RegistrySetting CreateFromJsonString(string json)
-        {
-            return CreateFromJsonString<RegistrySetting>(json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistrySettlement.cs b/BunqSdk/Model/Generated/Endpoint/RegistrySettlement.cs
index be9a9fd..3df854a 100644
--- a/BunqSdk/Model/Generated/Endpoint/RegistrySettlement.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RegistrySettlement.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,120 +21,114 @@ public class RegistrySettlement : BunqModel
         protected const string ENDPOINT_URL_CREATE = "user/{0}/registry/{1}/registry-settlement";
         protected const string ENDPOINT_URL_READ = "user/{0}/registry/{1}/registry-settlement/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/registry/{1}/registry-settlement";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "RegistrySettlement";
-
+    
         /// <summary>
         /// The id of the RegistrySettlement.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the RegistrySettlement's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the RegistrySettlement's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the Registry's settlement.
         /// </summary>
         [JsonProperty(PropertyName = "settlement_time")]
         public string SettlementTime { get; set; }
-
+    
         /// <summary>
         /// The total amount spent for the RegistrySettlement.
         /// </summary>
         [JsonProperty(PropertyName = "total_amount_spent")]
         public Amount TotalAmountSpent { get; set; }
-
+    
         /// <summary>
         /// The number of RegistryEntry's associated with this RegistrySettlement.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_entries")]
         public int? NumberOfEntries { get; set; }
-
+    
         /// <summary>
         /// The membership of the user that settled the Registry.
         /// </summary>
         [JsonProperty(PropertyName = "settled_by_alias")]
         public RegistryMembership SettledByAlias { get; set; }
-
+    
         /// <summary>
         /// The membership of the user that has settled the registry.
         /// </summary>
         [JsonProperty(PropertyName = "membership_settled")]
         public RegistryMembership MembershipSettled { get; set; }
-
+    
         /// <summary>
         /// List of RegistrySettlementItems
         /// </summary>
         [JsonProperty(PropertyName = "items")]
         public List<RegistrySettlementItem> Items { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new Slice group settlement.
         /// </summary>
         public static BunqResponse<int> Create(int registryId, 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(), registryId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), registryId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a specific Slice group settlement.
         /// </summary>
-        public static BunqResponse<RegistrySettlement> Get(int registryId, int registrySettlementId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RegistrySettlement> Get(int registryId, int registrySettlementId, 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(), registryId, registrySettlementId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), registryId, registrySettlementId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<RegistrySettlement>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a listing of all Slice group settlements.
         /// </summary>
-        public static BunqResponse<List<RegistrySettlement>> List(int registryId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RegistrySettlement>> List(int registryId, 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(), registryId),
-                urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), registryId), urlParams, customHeaders);
+    
             return FromJsonList<RegistrySettlement>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -141,55 +137,55 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.SettlementTime != null)
             {
                 return false;
             }
-
+    
             if (this.TotalAmountSpent != null)
             {
                 return false;
             }
-
+    
             if (this.NumberOfEntries != null)
             {
                 return false;
             }
-
+    
             if (this.SettledByAlias != null)
             {
                 return false;
             }
-
+    
             if (this.MembershipSettled != null)
             {
                 return false;
             }
-
+    
             if (this.Items != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RegistrySettlement CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RegistrySettlement>(json);
+            return BunqModel.CreateFromJsonString<RegistrySettlement>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RegistrySettlementPending.cs b/BunqSdk/Model/Generated/Endpoint/RegistrySettlementPending.cs
deleted file mode 100644
index 548ba5b..0000000
--- a/BunqSdk/Model/Generated/Endpoint/RegistrySettlementPending.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using System.Collections.Generic;
-using Bunq.Sdk.Http;
-using Bunq.Sdk.Model.Core;
-using Bunq.Sdk.Model.Generated.Object;
-using Newtonsoft.Json;
-
-namespace Bunq.Sdk.Model.Generated.Endpoint
-{
-    /// <summary>
-    /// Used to manage pending Slice group settlements.
-    /// </summary>
-    public class RegistrySettlementPending : BunqModel
-    {
-        /// <summary>
-        /// Endpoint constants.
-        /// </summary>
-        protected const string ENDPOINT_URL_LISTING = "user/{0}/registry/{1}/registry-settlement-pending";
-
-        /// <summary>
-        /// Object type.
-        /// </summary>
-        private const string OBJECT_TYPE_GET = "RegistrySettlementPending";
-
-        /// <summary>
-        /// List of RegistrySettlementItems
-        /// </summary>
-        [JsonProperty(PropertyName = "items")]
-        public List<RegistrySettlementItem> Items { get; set; }
-
-        /// <summary>
-        /// Get a listing of all pending Slice group settlements.
-        /// </summary>
-        public static BunqResponse<List<RegistrySettlementPending>> List(int registryId,
-            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(), registryId),
-                urlParams, customHeaders);
-
-            return FromJsonList<RegistrySettlementPending>(responseRaw, OBJECT_TYPE_GET);
-        }
-
-
-        /// <summary>
-        /// </summary>
-        public override bool IsAllFieldNull()
-        {
-            if (this.Items != null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// </summary>
-        public static RegistrySettlementPending CreateFromJsonString(string json)
-        {
-            return CreateFromJsonString<RegistrySettlementPending>(json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/BunqSdk/Model/Generated/Endpoint/RelationUser.cs b/BunqSdk/Model/Generated/Endpoint/RelationUser.cs
index 79a4d66..b06a80a 100644
--- a/BunqSdk/Model/Generated/Endpoint/RelationUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RelationUser.cs
@@ -1,6 +1,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -14,38 +15,39 @@ public class RelationUser : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "user_id")]
         public string UserId { get; set; }
-
+    
         /// <summary>
         /// The counter user's ID.
         /// </summary>
         [JsonProperty(PropertyName = "counter_user_id")]
         public string CounterUserId { get; set; }
-
+    
         /// <summary>
         /// The user's label.
         /// </summary>
         [JsonProperty(PropertyName = "label_user")]
         public LabelUser LabelUser { get; set; }
-
+    
         /// <summary>
         /// The counter user's label.
         /// </summary>
         [JsonProperty(PropertyName = "counter_label_user")]
         public LabelUser CounterLabelUser { get; set; }
-
+    
         /// <summary>
         /// The requested relation type.
         /// </summary>
         [JsonProperty(PropertyName = "relationship")]
         public string Relationship { get; set; }
-
+    
         /// <summary>
         /// The request's status, only for UPDATE.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -54,40 +56,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.CounterUserId != null)
             {
                 return false;
             }
-
+    
             if (this.LabelUser != null)
             {
                 return false;
             }
-
+    
             if (this.CounterLabelUser != null)
             {
                 return false;
             }
-
+    
             if (this.Relationship != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RelationUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RelationUser>(json);
+            return BunqModel.CreateFromJsonString<RelationUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RequestInquiry.cs b/BunqSdk/Model/Generated/Endpoint/RequestInquiry.cs
index a82ca3e..f46079c 100644
--- a/BunqSdk/Model/Generated/Endpoint/RequestInquiry.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RequestInquiry.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -23,7 +25,7 @@ public class RequestInquiry : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/request-inquiry/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-inquiry";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-inquiry/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -41,198 +43,198 @@ public class RequestInquiry : BunqModel
         public const string FIELD_ALLOW_BUNQME = "allow_bunqme";
         public const string FIELD_REDIRECT_URL = "redirect_url";
         public const string FIELD_EVENT_ID = "event_id";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_PUT = "RequestInquiry";
         private const string OBJECT_TYPE_GET = "RequestInquiry";
-
+    
         /// <summary>
         /// The requested amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_inquired")]
         public Amount AmountInquired { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the MonetaryAccount the money was requested from.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The description of the inquiry.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The attachments attached to the payment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<BunqId> Attachment { get; set; }
-
+    
         /// <summary>
         /// The client's custom reference that was attached to the request and the mutation.
         /// </summary>
         [JsonProperty(PropertyName = "merchant_reference")]
         public string MerchantReference { get; set; }
-
+    
         /// <summary>
         /// The status of the request.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The minimum age the user accepting the RequestInquiry must have.
         /// </summary>
         [JsonProperty(PropertyName = "minimum_age")]
         public int? MinimumAge { get; set; }
-
+    
         /// <summary>
         /// Whether or not an address must be provided on accept.
         /// </summary>
         [JsonProperty(PropertyName = "require_address")]
         public string RequireAddress { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not the accepting user can give an extra tip on top of the requested Amount.
         /// Defaults to false.
         /// </summary>
         [JsonProperty(PropertyName = "want_tip")]
         public bool? WantTip { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not the accepting user can choose to accept with a lower amount than requested.
         /// Defaults to false.
         /// </summary>
         [JsonProperty(PropertyName = "allow_amount_lower")]
         public bool? AllowAmountLower { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not the accepting user can choose to accept with a higher amount than requested.
         /// Defaults to false.
         /// </summary>
         [JsonProperty(PropertyName = "allow_amount_higher")]
         public bool? AllowAmountHigher { get; set; }
-
+    
         /// <summary>
         /// Whether or not sending a bunq.me request is allowed.
         /// </summary>
         [JsonProperty(PropertyName = "allow_bunqme")]
         public bool? AllowBunqme { get; set; }
-
+    
         /// <summary>
         /// The URL which the user is sent to after accepting or rejecting the Request.
         /// </summary>
         [JsonProperty(PropertyName = "redirect_url")]
         public string RedirectUrl { get; set; }
-
+    
         /// <summary>
         /// 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; }
-
+    
         /// <summary>
         /// The id of the created RequestInquiry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the payment request's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the payment request's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the payment request was responded to.
         /// </summary>
         [JsonProperty(PropertyName = "time_responded")]
         public string TimeResponded { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the payment request expired.
         /// </summary>
         [JsonProperty(PropertyName = "time_expiry")]
         public string TimeExpiry { get; set; }
-
+    
         /// <summary>
         /// The id of the monetary account the request response applies to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The responded amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_responded")]
         public Amount AmountResponded { get; set; }
-
+    
         /// <summary>
         /// The label that's displayed to the counterparty with the mutation. Includes user.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_created")]
         public LabelUser UserAliasCreated { get; set; }
-
+    
         /// <summary>
         /// The label that's displayed to the counterparty with the mutation. Includes user.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_revoked")]
         public LabelUser UserAliasRevoked { get; set; }
-
+    
         /// <summary>
         /// The id of the batch if the request was part of a batch.
         /// </summary>
         [JsonProperty(PropertyName = "batch_id")]
         public int? 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; }
-
+    
         /// <summary>
         /// The url that points to the bunq.me request.
         /// </summary>
         [JsonProperty(PropertyName = "bunqme_share_url")]
         public string BunqmeShareUrl { get; set; }
-
+    
         /// <summary>
         /// The shipping address provided by the accepting user if an address was requested.
         /// </summary>
         [JsonProperty(PropertyName = "address_shipping")]
         public Address AddressShipping { get; set; }
-
+    
         /// <summary>
         /// The billing address provided by the accepting user if an address was requested.
         /// </summary>
         [JsonProperty(PropertyName = "address_billing")]
         public Address AddressBilling { get; set; }
-
+    
         /// <summary>
         /// The geolocation where the payment was done.
         /// </summary>
         [JsonProperty(PropertyName = "geolocation")]
         public Geolocation Geolocation { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be Payment, PaymentBatch, ScheduleInstance,
         /// RequestResponse and MasterCardAction
         /// </summary>
         [JsonProperty(PropertyName = "reference_split_the_bill")]
         public RequestReferenceSplitTheBillAnchorObject ReferenceSplitTheBill { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new payment request.
         /// </summary>
@@ -250,106 +252,87 @@ public class RequestInquiry : 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(Amount amountInquired, Pointer counterpartyAlias, string description,
-            bool? allowBunqme, int? monetaryAccountId = null, List<BunqId> 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<int> Create(Amount amountInquired, Pointer counterpartyAlias, string description, bool? allowBunqme, int? monetaryAccountId= null, List<BunqId> 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)
         {
             if (customHeaders == null) customHeaders = new Dictionary<string, string>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-
+    
             var requestMap = new Dictionary<string, object>
-            {
-                {FIELD_AMOUNT_INQUIRED, amountInquired},
-                {FIELD_COUNTERPARTY_ALIAS, counterpartyAlias},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_ATTACHMENT, attachment},
-                {FIELD_MERCHANT_REFERENCE, merchantReference},
-                {FIELD_STATUS, status},
-                {FIELD_MINIMUM_AGE, minimumAge},
-                {FIELD_REQUIRE_ADDRESS, requireAddress},
-                {FIELD_WANT_TIP, wantTip},
-                {FIELD_ALLOW_AMOUNT_LOWER, allowAmountLower},
-                {FIELD_ALLOW_AMOUNT_HIGHER, allowAmountHigher},
-                {FIELD_ALLOW_BUNQME, allowBunqme},
-                {FIELD_REDIRECT_URL, redirectUrl},
-                {FIELD_EVENT_ID, eventId},
-            };
-
+    {
+    {FIELD_AMOUNT_INQUIRED, amountInquired},
+    {FIELD_COUNTERPARTY_ALIAS, counterpartyAlias},
+    {FIELD_DESCRIPTION, description},
+    {FIELD_ATTACHMENT, attachment},
+    {FIELD_MERCHANT_REFERENCE, merchantReference},
+    {FIELD_STATUS, status},
+    {FIELD_MINIMUM_AGE, minimumAge},
+    {FIELD_REQUIRE_ADDRESS, requireAddress},
+    {FIELD_WANT_TIP, wantTip},
+    {FIELD_ALLOW_AMOUNT_LOWER, allowAmountLower},
+    {FIELD_ALLOW_AMOUNT_HIGHER, allowAmountHigher},
+    {FIELD_ALLOW_BUNQME, allowBunqme},
+    {FIELD_REDIRECT_URL, redirectUrl},
+    {FIELD_EVENT_ID, eventId},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// 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<RequestInquiry> Update(int requestInquiryId, int? monetaryAccountId = null,
-            string status = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestInquiry> Update(int requestInquiryId, int? 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},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestInquiryId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId), requestBytes, customHeaders);
+    
             return FromJson<RequestInquiry>(responseRaw, OBJECT_TYPE_PUT);
         }
-
+    
         /// <summary>
         /// 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<RequestInquiry>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RequestInquiry>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<RequestInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// 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<RequestInquiry> Get(int requestInquiryId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestInquiry> Get(int requestInquiryId, int? 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),
-                        requestInquiryId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<RequestInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -358,135 +341,135 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.TimeResponded != null)
             {
                 return false;
             }
-
+    
             if (this.TimeExpiry != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.AmountInquired != null)
             {
                 return false;
             }
-
+    
             if (this.AmountResponded != null)
             {
                 return false;
             }
-
+    
             if (this.UserAliasCreated != null)
             {
                 return false;
             }
-
+    
             if (this.UserAliasRevoked != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.MerchantReference != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.BatchId != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduledId != null)
             {
                 return false;
             }
-
+    
             if (this.MinimumAge != null)
             {
                 return false;
             }
-
+    
             if (this.RequireAddress != null)
             {
                 return false;
             }
-
+    
             if (this.BunqmeShareUrl != null)
             {
                 return false;
             }
-
+    
             if (this.RedirectUrl != null)
             {
                 return false;
             }
-
+    
             if (this.AddressShipping != null)
             {
                 return false;
             }
-
+    
             if (this.AddressBilling != null)
             {
                 return false;
             }
-
+    
             if (this.Geolocation != null)
             {
                 return false;
             }
-
+    
             if (this.ReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RequestInquiry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RequestInquiry>(json);
+            return BunqModel.CreateFromJsonString<RequestInquiry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RequestInquiryBatch.cs b/BunqSdk/Model/Generated/Endpoint/RequestInquiryBatch.cs
index 9338055..2f0d1ab 100644
--- a/BunqSdk/Model/Generated/Endpoint/RequestInquiryBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RequestInquiryBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +22,7 @@ public class RequestInquiryBatch : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-inquiry-batch/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-inquiry-batch";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -28,44 +30,44 @@ public class RequestInquiryBatch : BunqModel
         public const string FIELD_STATUS = "status";
         public const string FIELD_TOTAL_AMOUNT_INQUIRED = "total_amount_inquired";
         public const string FIELD_EVENT_ID = "event_id";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "RequestInquiryBatch";
-
+    
         /// <summary>
         /// The list of requests that were made.
         /// </summary>
         [JsonProperty(PropertyName = "request_inquiries")]
         public List<RequestInquiry> RequestInquiries { get; set; }
-
+    
         /// <summary>
         /// The status of the request.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The total amount originally inquired for this batch.
         /// </summary>
         [JsonProperty(PropertyName = "total_amount_inquired")]
         public Amount TotalAmountInquired { get; set; }
-
+    
         /// <summary>
         /// 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; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be Payment, PaymentBatch, ScheduleInstance,
         /// RequestResponse and MasterCardAction
         /// </summary>
         [JsonProperty(PropertyName = "reference_split_the_bill")]
         public RequestReferenceSplitTheBillAnchorObject ReferenceSplitTheBill { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a request batch by sending an array of single request objects, that will become part of the batch.
         /// </summary>
@@ -73,92 +75,75 @@ public class RequestInquiryBatch : 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<RequestInquiry> requestInquiries, Amount totalAmountInquired,
-            int? monetaryAccountId = null, string status = null, int? eventId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(List<RequestInquiry> requestInquiries, Amount totalAmountInquired, int? monetaryAccountId= null, string status = null, int? eventId = 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_REQUEST_INQUIRIES, requestInquiries},
-                {FIELD_STATUS, status},
-                {FIELD_TOTAL_AMOUNT_INQUIRED, totalAmountInquired},
-                {FIELD_EVENT_ID, eventId},
-            };
-
+    {
+    {FIELD_REQUEST_INQUIRIES, requestInquiries},
+    {FIELD_STATUS, status},
+    {FIELD_TOTAL_AMOUNT_INQUIRED, totalAmountInquired},
+    {FIELD_EVENT_ID, eventId},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// 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<int> Update(int requestInquiryBatchId, int? 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},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestInquiryBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Return the details of a specific request batch.
         /// </summary>
-        public static BunqResponse<RequestInquiryBatch> Get(int requestInquiryBatchId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestInquiryBatch> Get(int requestInquiryBatchId, int? 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),
-                        requestInquiryBatchId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestInquiryBatchId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<RequestInquiryBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Return all the request batches for a monetary account.
         /// </summary>
-        public static BunqResponse<List<RequestInquiryBatch>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RequestInquiryBatch>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<RequestInquiryBatch>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -167,25 +152,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TotalAmountInquired != null)
             {
                 return false;
             }
-
+    
             if (this.ReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RequestInquiryBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RequestInquiryBatch>(json);
+            return BunqModel.CreateFromJsonString<RequestInquiryBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RequestResponse.cs b/BunqSdk/Model/Generated/Endpoint/RequestResponse.cs
index 62db495..eaf1edb 100644
--- a/BunqSdk/Model/Generated/Endpoint/RequestResponse.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RequestResponse.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -22,7 +24,7 @@ public class RequestResponse : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/request-response/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/request-response";
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/request-response/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -30,186 +32,186 @@ public class RequestResponse : BunqModel
         public const string FIELD_STATUS = "status";
         public const string FIELD_ADDRESS_SHIPPING = "address_shipping";
         public const string FIELD_ADDRESS_BILLING = "address_billing";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_PUT = "RequestResponse";
         private const string OBJECT_TYPE_GET = "RequestResponse";
-
+    
         /// <summary>
         /// The Amount the RequestResponse was accepted with.
         /// </summary>
         [JsonProperty(PropertyName = "amount_responded")]
         public Amount AmountResponded { get; set; }
-
+    
         /// <summary>
         /// The status of the RequestResponse. Can be ACCEPTED, PENDING, REJECTED, REFUND_REQUESTED, REFUNDED or
         /// REVOKED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The shipping address provided by the accepting user if an address was requested.
         /// </summary>
         [JsonProperty(PropertyName = "address_shipping")]
         public Address AddressShipping { get; set; }
-
+    
         /// <summary>
         /// The billing address provided by the accepting user if an address was requested.
         /// </summary>
         [JsonProperty(PropertyName = "address_billing")]
         public Address AddressBilling { get; set; }
-
+    
         /// <summary>
         /// The id of the Request Response.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the Request Response was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp when the Request Response was last updated (will be updated when chat messages are received).
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the RequestResponse was responded to.
         /// </summary>
         [JsonProperty(PropertyName = "time_responded")]
         public string TimeResponded { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the RequestResponse expired or will expire.
         /// </summary>
         [JsonProperty(PropertyName = "time_expiry")]
         public string TimeExpiry { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when a refund request for the RequestResponse was claimed.
         /// </summary>
         [JsonProperty(PropertyName = "time_refund_requested")]
         public string TimeRefundRequested { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the RequestResponse was refunded.
         /// </summary>
         [JsonProperty(PropertyName = "time_refunded")]
         public string TimeRefunded { get; set; }
-
+    
         /// <summary>
         /// The label of the user that requested the refund.
         /// </summary>
         [JsonProperty(PropertyName = "user_refund_requested")]
         public LabelUser UserRefundRequested { get; set; }
-
+    
         /// <summary>
         /// The id of the MonetaryAccount the RequestResponse was received on.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The requested Amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_inquired")]
         public Amount AmountInquired { get; set; }
-
+    
         /// <summary>
         /// The description for the RequestResponse provided by the requesting party. Maximum 9000 characters.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the MonetaryAccount this RequestResponse was
         /// received on.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the MonetaryAccount that is requesting money with
         /// this RequestResponse.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The Attachments attached to the RequestResponse.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<Attachment> Attachment { get; set; }
-
+    
         /// <summary>
         /// The minimum age the user accepting the RequestResponse must have.
         /// </summary>
         [JsonProperty(PropertyName = "minimum_age")]
         public int? MinimumAge { get; set; }
-
+    
         /// <summary>
         /// Whether or not an address must be provided on accept.
         /// </summary>
         [JsonProperty(PropertyName = "require_address")]
         public string RequireAddress { get; set; }
-
+    
         /// <summary>
         /// The Geolocation where the RequestResponse was created.
         /// </summary>
         [JsonProperty(PropertyName = "geolocation")]
         public Geolocation Geolocation { get; set; }
-
+    
         /// <summary>
         /// The type of the RequestInquiry. Can be DIRECT_DEBIT, DIRECT_DEBIT_B2B, IDEAL, SOFORT or INTERNAL.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The subtype of the RequestInquiry. Can be ONCE or RECURRING for DIRECT_DEBIT RequestInquiries and NONE for
         /// all other.
         /// </summary>
         [JsonProperty(PropertyName = "sub_type")]
         public string SubType { get; set; }
-
+    
         /// <summary>
         /// The URL which the user is sent to after accepting or rejecting the Request.
         /// </summary>
         [JsonProperty(PropertyName = "redirect_url")]
         public string RedirectUrl { get; set; }
-
+    
         /// <summary>
         /// The credit scheme id provided by the counterparty for DIRECT_DEBIT inquiries.
         /// </summary>
         [JsonProperty(PropertyName = "credit_scheme_identifier")]
         public string CreditSchemeIdentifier { get; set; }
-
+    
         /// <summary>
         /// The mandate id provided by the counterparty for DIRECT_DEBIT inquiries.
         /// </summary>
         [JsonProperty(PropertyName = "mandate_identifier")]
         public string MandateIdentifier { get; set; }
-
+    
         /// <summary>
         /// The whitelist id for this action or null.
         /// </summary>
         [JsonProperty(PropertyName = "eligible_whitelist_id")]
         public int? EligibleWhitelistId { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
         [JsonProperty(PropertyName = "request_reference_split_the_bill")]
         public List<RequestInquiryReference> RequestReferenceSplitTheBill { get; set; }
-
-
+    
+    
         /// <summary>
         /// Update the status to accept or reject the RequestResponse.
         /// </summary>
@@ -217,67 +219,54 @@ public class RequestResponse : BunqModel
         /// <param name="status">The responding status of the RequestResponse. Can be ACCEPTED or REJECTED.</param>
         /// <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>
-        public static BunqResponse<RequestResponse> Update(int requestResponseId, int? monetaryAccountId = null,
-            Amount amountResponded = null, string status = null, Address addressShipping = null,
-            Address addressBilling = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestResponse> Update(int requestResponseId, int? monetaryAccountId= null, Amount amountResponded = null, string status = null, Address addressShipping = null, Address addressBilling = 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_AMOUNT_RESPONDED, amountResponded},
-                {FIELD_STATUS, status},
-                {FIELD_ADDRESS_SHIPPING, addressShipping},
-                {FIELD_ADDRESS_BILLING, addressBilling},
-            };
-
+    {
+    {FIELD_AMOUNT_RESPONDED, amountResponded},
+    {FIELD_STATUS, status},
+    {FIELD_ADDRESS_SHIPPING, addressShipping},
+    {FIELD_ADDRESS_BILLING, addressBilling},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        requestResponseId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId), requestBytes, customHeaders);
+    
             return FromJson<RequestResponse>(responseRaw, OBJECT_TYPE_PUT);
         }
-
+    
         /// <summary>
         /// Get all RequestResponses for a MonetaryAccount.
         /// </summary>
-        public static BunqResponse<List<RequestResponse>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RequestResponse>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<RequestResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get the details for a specific existing RequestResponse.
         /// </summary>
-        public static BunqResponse<RequestResponse> Get(int requestResponseId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RequestResponse> Get(int requestResponseId, int? 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),
-                        requestResponseId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), requestResponseId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<RequestResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -286,150 +275,150 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.TimeResponded != null)
             {
                 return false;
             }
-
+    
             if (this.TimeExpiry != null)
             {
                 return false;
             }
-
+    
             if (this.TimeRefundRequested != null)
             {
                 return false;
             }
-
+    
             if (this.TimeRefunded != null)
             {
                 return false;
             }
-
+    
             if (this.UserRefundRequested != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.AmountInquired != null)
             {
                 return false;
             }
-
+    
             if (this.AmountResponded != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             if (this.MinimumAge != null)
             {
                 return false;
             }
-
+    
             if (this.RequireAddress != null)
             {
                 return false;
             }
-
+    
             if (this.Geolocation != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.SubType != null)
             {
                 return false;
             }
-
+    
             if (this.RedirectUrl != null)
             {
                 return false;
             }
-
+    
             if (this.AddressBilling != null)
             {
                 return false;
             }
-
+    
             if (this.AddressShipping != null)
             {
                 return false;
             }
-
+    
             if (this.CreditSchemeIdentifier != null)
             {
                 return false;
             }
-
+    
             if (this.MandateIdentifier != null)
             {
                 return false;
             }
-
+    
             if (this.EligibleWhitelistId != null)
             {
                 return false;
             }
-
+    
             if (this.RequestReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RequestResponse CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RequestResponse>(json);
+            return BunqModel.CreateFromJsonString<RequestResponse>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Reward.cs b/BunqSdk/Model/Generated/Endpoint/Reward.cs
index 181f5b1..47d6f8e 100644
--- a/BunqSdk/Model/Generated/Endpoint/Reward.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Reward.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,90 +20,87 @@ public class Reward : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/reward/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/reward";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Reward";
-
+    
         /// <summary>
         /// The id of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The time the reward was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The time the reward was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The status of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The subStatus of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The type of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The alias of the other user eligible for the reward award.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public LabelUser CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The amount that will be/was awarded as reward for the reward.
         /// </summary>
         [JsonProperty(PropertyName = "amount_reward")]
         public Amount AmountReward { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public static BunqResponse<Reward> Get(int rewardId, 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(), rewardId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), rewardId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Reward>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<Reward>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Reward>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<Reward>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -108,50 +109,50 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.AmountReward != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Reward CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Reward>(json);
+            return BunqModel.CreateFromJsonString<Reward>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RewardRecipient.cs b/BunqSdk/Model/Generated/Endpoint/RewardRecipient.cs
index bb19c96..17e6208 100644
--- a/BunqSdk/Model/Generated/Endpoint/RewardRecipient.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RewardRecipient.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,91 +20,87 @@ public class RewardRecipient : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/reward-recipient/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/reward-recipient";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "RewardRecipient";
-
+    
         /// <summary>
         /// The id of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The time the reward was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The time the reward was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The status of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The subStatus of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The type of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The alias of the other user eligible for the reward award.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public LabelUser CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The amount that will be/was awarded as reward for the reward.
         /// </summary>
         [JsonProperty(PropertyName = "amount_reward")]
         public Amount AmountReward { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<RewardRecipient> Get(int rewardRecipientId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RewardRecipient> Get(int rewardRecipientId, 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(), rewardRecipientId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), rewardRecipientId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<RewardRecipient>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<RewardRecipient>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RewardRecipient>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<RewardRecipient>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -109,50 +109,50 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.AmountReward != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RewardRecipient CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RewardRecipient>(json);
+            return BunqModel.CreateFromJsonString<RewardRecipient>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/RewardSender.cs b/BunqSdk/Model/Generated/Endpoint/RewardSender.cs
index 7519910..2b29ac5 100644
--- a/BunqSdk/Model/Generated/Endpoint/RewardSender.cs
+++ b/BunqSdk/Model/Generated/Endpoint/RewardSender.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,91 +20,87 @@ public class RewardSender : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/reward-sender/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/reward-sender";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "RewardSender";
-
+    
         /// <summary>
         /// The id of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The time the reward was created.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The time the reward was last updated.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The status of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The subStatus of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The type of the reward.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The alias of the other user eligible for the reward award.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public LabelUser CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The amount that will be/was awarded as reward for the reward.
         /// </summary>
         [JsonProperty(PropertyName = "amount_reward")]
         public Amount AmountReward { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<RewardSender> Get(int rewardSenderId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<RewardSender> Get(int rewardSenderId, 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(), rewardSenderId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), rewardSenderId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<RewardSender>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<RewardSender>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<RewardSender>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<RewardSender>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -109,50 +109,50 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.AmountReward != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RewardSender CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RewardSender>(json);
+            return BunqModel.CreateFromJsonString<RewardSender>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/SandboxUserCompany.cs b/BunqSdk/Model/Generated/Endpoint/SandboxUserCompany.cs
index 35a75d7..6476025 100644
--- a/BunqSdk/Model/Generated/Endpoint/SandboxUserCompany.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SandboxUserCompany.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,37 +18,37 @@ public class SandboxUserCompany : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "sandbox-user-company";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "ApiKey";
-
+    
         /// <summary>
         /// The API key of the newly created sandbox userCompany.
         /// </summary>
         [JsonProperty(PropertyName = "api_key")]
         public string ApiKey { get; set; }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<SandboxUserCompany> Create(IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SandboxUserCompany> 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(ENDPOINT_URL_CREATE, requestBytes, customHeaders);
-
+    
             return FromJson<SandboxUserCompany>(responseRaw, OBJECT_TYPE_POST);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -55,15 +57,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static SandboxUserCompany CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<SandboxUserCompany>(json);
+            return BunqModel.CreateFromJsonString<SandboxUserCompany>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/SandboxUserPerson.cs b/BunqSdk/Model/Generated/Endpoint/SandboxUserPerson.cs
index 9c5831c..c262974 100644
--- a/BunqSdk/Model/Generated/Endpoint/SandboxUserPerson.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SandboxUserPerson.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,37 +18,37 @@ public class SandboxUserPerson : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "sandbox-user-person";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "ApiKey";
-
+    
         /// <summary>
         /// The API key of the newly created sandbox userPerson.
         /// </summary>
         [JsonProperty(PropertyName = "api_key")]
         public string ApiKey { get; set; }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<SandboxUserPerson> Create(IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SandboxUserPerson> 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(ENDPOINT_URL_CREATE, requestBytes, customHeaders);
-
+    
             return FromJson<SandboxUserPerson>(responseRaw, OBJECT_TYPE_POST);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -55,15 +57,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static SandboxUserPerson CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<SandboxUserPerson>(json);
+            return BunqModel.CreateFromJsonString<SandboxUserPerson>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Schedule.cs b/BunqSdk/Model/Generated/Endpoint/Schedule.cs
index 504e65b..c3bba58 100644
--- a/BunqSdk/Model/Generated/Endpoint/Schedule.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Schedule.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,7 +20,7 @@ public class Schedule : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -24,87 +28,79 @@ public class Schedule : BunqModel
         public const string FIELD_TIME_END = "time_end";
         public const string FIELD_RECURRENCE_UNIT = "recurrence_unit";
         public const string FIELD_RECURRENCE_SIZE = "recurrence_size";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Schedule";
-
+    
         /// <summary>
         /// The schedule start time (UTC).
         /// </summary>
         [JsonProperty(PropertyName = "time_start")]
         public string TimeStart { get; set; }
-
+    
         /// <summary>
         /// The schedule end time (UTC).
         /// </summary>
         [JsonProperty(PropertyName = "time_end")]
         public string TimeEnd { get; set; }
-
+    
         /// <summary>
         /// The schedule recurrence unit, options: ONCE, HOURLY, DAILY, WEEKLY, MONTHLY, YEARLY
         /// </summary>
         [JsonProperty(PropertyName = "recurrence_unit")]
         public string RecurrenceUnit { get; set; }
-
+    
         /// <summary>
         /// 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; }
-
+    
         /// <summary>
         /// The schedule status, options: ACTIVE, FINISHED, CANCELLED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The scheduled object. (Payment, PaymentBatch)
         /// </summary>
         [JsonProperty(PropertyName = "object")]
         public ScheduleAnchorObject Object { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get a specific schedule definition for a given monetary account.
         /// </summary>
-        public static BunqResponse<Schedule> Get(int scheduleId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<Schedule> Get(int scheduleId, int? 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),
-                        scheduleId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Schedule>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a collection of scheduled definition for a given monetary account. You can add the parameter type to
         /// 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<Schedule>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Schedule>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<Schedule>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -113,40 +109,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TimeEnd != null)
             {
                 return false;
             }
-
+    
             if (this.RecurrenceUnit != null)
             {
                 return false;
             }
-
+    
             if (this.RecurrenceSize != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.Object != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Schedule CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Schedule>(json);
+            return BunqModel.CreateFromJsonString<Schedule>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ScheduleInstance.cs b/BunqSdk/Model/Generated/Endpoint/ScheduleInstance.cs
index a46199a..578d931 100644
--- a/BunqSdk/Model/Generated/Endpoint/ScheduleInstance.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ScheduleInstance.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,118 +21,106 @@ public class ScheduleInstance : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule/{2}/schedule-instance";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_STATE = "state";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ScheduledInstance";
-
+    
         /// <summary>
         /// The state of the scheduleInstance. (FINISHED_SUCCESSFULLY, RETRY, FAILED_USER_ERROR)
         /// </summary>
         [JsonProperty(PropertyName = "state")]
         public string State { get; set; }
-
+    
         /// <summary>
         /// The schedule start time (UTC).
         /// </summary>
         [JsonProperty(PropertyName = "time_start")]
         public string TimeStart { get; set; }
-
+    
         /// <summary>
         /// The schedule end time (UTC).
         /// </summary>
         [JsonProperty(PropertyName = "time_end")]
         public string TimeEnd { get; set; }
-
+    
         /// <summary>
         /// The message when the scheduled instance has run and failed due to user error.
         /// </summary>
         [JsonProperty(PropertyName = "error_message")]
         public List<Error> ErrorMessage { get; set; }
-
+    
         /// <summary>
         /// The scheduled object. (Payment, PaymentBatch)
         /// </summary>
         [JsonProperty(PropertyName = "scheduled_object")]
         public ScheduleAnchorObject ScheduledObject { get; set; }
-
+    
         /// <summary>
         /// The result object of this schedule instance. (Payment, PaymentBatch)
         /// </summary>
         [JsonProperty(PropertyName = "result_object")]
         public ScheduleInstanceAnchorObject ResultObject { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
         [JsonProperty(PropertyName = "request_reference_split_the_bill")]
         public List<RequestInquiryReference> RequestReferenceSplitTheBill { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<ScheduleInstance> Get(int scheduleId, int scheduleInstanceId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ScheduleInstance> Get(int scheduleId, int scheduleInstanceId, int? 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),
-                        scheduleId, scheduleInstanceId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<ScheduleInstance>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <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<int> Update(int scheduleId, int scheduleInstanceId, int? monetaryAccountId= null, string state = 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_STATE, state},
-            };
-
+    {
+    {FIELD_STATE, state},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        scheduleId, scheduleInstanceId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId, scheduleInstanceId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<ScheduleInstance>> List(int scheduleId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ScheduleInstance>> List(int scheduleId, int? 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), scheduleId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), scheduleId), urlParams, customHeaders);
+    
             return FromJsonList<ScheduleInstance>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -139,45 +129,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TimeStart != null)
             {
                 return false;
             }
-
+    
             if (this.TimeEnd != null)
             {
                 return false;
             }
-
+    
             if (this.ErrorMessage != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduledObject != null)
             {
                 return false;
             }
-
+    
             if (this.ResultObject != null)
             {
                 return false;
             }
-
+    
             if (this.RequestReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ScheduleInstance CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ScheduleInstance>(json);
+            return BunqModel.CreateFromJsonString<ScheduleInstance>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/SchedulePayment.cs b/BunqSdk/Model/Generated/Endpoint/SchedulePayment.cs
index cf31839..547223b 100644
--- a/BunqSdk/Model/Generated/Endpoint/SchedulePayment.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SchedulePayment.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,141 +23,120 @@ public class SchedulePayment : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/schedule-payment/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/schedule-payment";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/schedule-payment/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_PAYMENT = "payment";
         public const string FIELD_SCHEDULE = "schedule";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ScheduledPayment";
         private const string OBJECT_TYPE_PUT = "ScheduledPayment";
-
+    
         /// <summary>
         /// The payment details.
         /// </summary>
         [JsonProperty(PropertyName = "payment")]
         public SchedulePaymentEntry Payment { get; set; }
-
+    
         /// <summary>
         /// The schedule details.
         /// </summary>
         [JsonProperty(PropertyName = "schedule")]
         public Schedule Schedule { get; set; }
-
+    
         /// <summary>
         /// The schedule status, options: ACTIVE, FINISHED, CANCELLED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
-
+    
+    
         /// <summary>
         /// </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<int> Create(SchedulePaymentEntry payment, Schedule schedule,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(SchedulePaymentEntry payment, Schedule schedule, int? 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>
-            {
-                {FIELD_PAYMENT, payment},
-                {FIELD_SCHEDULE, schedule},
-            };
-
+    {
+    {FIELD_PAYMENT, payment},
+    {FIELD_SCHEDULE, schedule},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int schedulePaymentId, int? 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),
-                        schedulePaymentId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<SchedulePayment> Get(int schedulePaymentId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SchedulePayment> Get(int schedulePaymentId, int? 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),
-                        schedulePaymentId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<SchedulePayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<SchedulePayment>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<SchedulePayment>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<SchedulePayment>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </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<SchedulePayment> Update(int schedulePaymentId, int? monetaryAccountId = null,
-            SchedulePaymentEntry payment = null, Schedule schedule = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SchedulePayment> Update(int schedulePaymentId, int? monetaryAccountId= null, SchedulePaymentEntry payment = null, Schedule schedule = 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_PAYMENT, payment},
-                {FIELD_SCHEDULE, schedule},
-            };
-
+    {
+    {FIELD_PAYMENT, payment},
+    {FIELD_SCHEDULE, schedule},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        schedulePaymentId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentId), requestBytes, customHeaders);
+    
             return FromJson<SchedulePayment>(responseRaw, OBJECT_TYPE_PUT);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -164,25 +145,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Schedule != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static SchedulePayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<SchedulePayment>(json);
+            return BunqModel.CreateFromJsonString<SchedulePayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/SchedulePaymentBatch.cs b/BunqSdk/Model/Generated/Endpoint/SchedulePaymentBatch.cs
index 6d7970d..f7b8a8c 100644
--- a/BunqSdk/Model/Generated/Endpoint/SchedulePaymentBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SchedulePaymentBatch.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,97 +21,84 @@ public class SchedulePaymentBatch : BunqModel
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/schedule-payment-batch";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}";
         protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/schedule-payment-batch/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_PAYMENTS = "payments";
         public const string FIELD_SCHEDULE = "schedule";
-
-
+    
+    
         /// <summary>
         /// The payment details.
         /// </summary>
         [JsonProperty(PropertyName = "payments")]
         public List<SchedulePaymentEntry> Payments { get; set; }
-
+    
         /// <summary>
         /// The schedule details.
         /// </summary>
         [JsonProperty(PropertyName = "schedule")]
         public Schedule Schedule { get; set; }
-
-
+    
+    
         /// <summary>
         /// </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<SchedulePaymentEntry> payments, Schedule schedule,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(List<SchedulePaymentEntry> payments, Schedule schedule, int? 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>
-            {
-                {FIELD_PAYMENTS, payments},
-                {FIELD_SCHEDULE, schedule},
-            };
-
+    {
+    {FIELD_PAYMENTS, payments},
+    {FIELD_SCHEDULE, schedule},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </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<SchedulePaymentEntry> payments = null, Schedule schedule = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int schedulePaymentBatchId, int? monetaryAccountId= null, List<SchedulePaymentEntry> payments = null, Schedule schedule = 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_PAYMENTS, payments},
-                {FIELD_SCHEDULE, schedule},
-            };
-
+    {
+    {FIELD_PAYMENTS, payments},
+    {FIELD_SCHEDULE, schedule},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        schedulePaymentBatchId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int schedulePaymentBatchId, int? 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),
-                        schedulePaymentBatchId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), schedulePaymentBatchId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -118,20 +107,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Schedule != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static SchedulePaymentBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<SchedulePaymentBatch>(json);
+            return BunqModel.CreateFromJsonString<SchedulePaymentBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ScheduleUser.cs b/BunqSdk/Model/Generated/Endpoint/ScheduleUser.cs
index ec0bf3f..e072446 100644
--- a/BunqSdk/Model/Generated/Endpoint/ScheduleUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ScheduleUser.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -13,44 +18,42 @@ public class ScheduleUser : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/schedule";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ScheduleUser";
-
+    
         /// <summary>
         /// Get a collection of scheduled definition for all accessible monetary accounts of the user. You can add the
         /// parameter type to 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<ScheduleUser>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ScheduleUser>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<ScheduleUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ScheduleUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ScheduleUser>(json);
+            return BunqModel.CreateFromJsonString<ScheduleUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Session.cs b/BunqSdk/Model/Generated/Endpoint/Session.cs
index d49187a..e7c6446 100644
--- a/BunqSdk/Model/Generated/Endpoint/Session.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Session.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -13,34 +18,34 @@ public class Session : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_DELETE = "session/{0}";
-
-
+    
+    
         /// <summary>
         /// Deletes the current session.
         /// </summary>
         public static BunqResponse<object> Delete(int sessionId, 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, sessionId), customHeaders);
-
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Session CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Session>(json);
+            return BunqModel.CreateFromJsonString<Session>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ShareInviteBankInquiryBatch.cs b/BunqSdk/Model/Generated/Endpoint/ShareInviteBankInquiryBatch.cs
index a97d77e..329cc80 100644
--- a/BunqSdk/Model/Generated/Endpoint/ShareInviteBankInquiryBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ShareInviteBankInquiryBatch.cs
@@ -1,6 +1,7 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
+using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -16,14 +17,15 @@ public class ShareInviteBankInquiryBatch : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "share_invite_bank_inquiries")]
         public List<ShareInviteMonetaryAccountInquiry> ShareInviteBankInquiries { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount containing the public information of this share invite inquiry batch.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -32,20 +34,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ShareInviteBankInquiryBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ShareInviteBankInquiryBatch>(json);
+            return BunqModel.CreateFromJsonString<ShareInviteBankInquiryBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountAmountUsed.cs b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountAmountUsed.cs
index 5c4a192..c94cb62 100644
--- a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountAmountUsed.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountAmountUsed.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,41 +19,35 @@ public class ShareInviteMonetaryAccountAmountUsed : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry/{2}/amount-used/{3}";
-
-
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry/{2}/amount-used/{3}";
+    
+    
         /// <summary>
         /// Reset the available budget for an account share. To be called without any ID at the end of the path.
         /// </summary>
-        public static BunqResponse<object> Delete(int shareInviteMonetaryAccountInquiryId,
-            int shareInviteMonetaryAccountAmountUsedId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int shareInviteMonetaryAccountInquiryId, int shareInviteMonetaryAccountAmountUsedId, int? 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),
-                        shareInviteMonetaryAccountInquiryId, shareInviteMonetaryAccountAmountUsedId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), shareInviteMonetaryAccountInquiryId, shareInviteMonetaryAccountAmountUsedId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ShareInviteMonetaryAccountAmountUsed CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ShareInviteMonetaryAccountAmountUsed>(json);
+            return BunqModel.CreateFromJsonString<ShareInviteMonetaryAccountAmountUsed>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountInquiry.cs b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountInquiry.cs
index bedc3b7..32c1086 100644
--- a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountInquiry.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountInquiry.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,15 +20,11 @@ public class ShareInviteMonetaryAccountInquiry : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry/{2}";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry/{2}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry/{2}";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry/{2}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/share-invite-monetary-account-inquiry";
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -38,30 +36,30 @@ public class ShareInviteMonetaryAccountInquiry : BunqModel
         public const string FIELD_SHARE_TYPE = "share_type";
         public const string FIELD_START_DATE = "start_date";
         public const string FIELD_END_DATE = "end_date";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ShareInviteMonetaryAccountInquiry";
-
+    
         /// <summary>
         /// The label of the user to share with.
         /// </summary>
         [JsonProperty(PropertyName = "counter_user_alias")]
         public LabelUser CounterUserAlias { get; set; }
-
+    
         /// <summary>
         /// The id of the draft share invite bank.
         /// </summary>
         [JsonProperty(PropertyName = "draft_share_invite_bank_id")]
         public int? DraftShareInviteBankId { get; set; }
-
+    
         /// <summary>
         /// The share details. Only one of these objects is returned.
         /// </summary>
         [JsonProperty(PropertyName = "share_detail")]
         public ShareDetail ShareDetail { get; set; }
-
+    
         /// <summary>
         /// 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,
@@ -69,62 +67,62 @@ public class ShareInviteMonetaryAccountInquiry : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The relationship: COMPANY_DIRECTOR, COMPANY_EMPLOYEE, etc
         /// </summary>
         [JsonProperty(PropertyName = "relationship")]
         public string Relationship { get; set; }
-
+    
         /// <summary>
         /// The share type, either STANDARD or MUTUAL.
         /// </summary>
         [JsonProperty(PropertyName = "share_type")]
         public string ShareType { get; set; }
-
+    
         /// <summary>
         /// The start date of this share.
         /// </summary>
         [JsonProperty(PropertyName = "start_date")]
         public string StartDate { get; set; }
-
+    
         /// <summary>
         /// The expiration date of this share.
         /// </summary>
         [JsonProperty(PropertyName = "end_date")]
         public string EndDate { get; set; }
-
+    
         /// <summary>
         /// The label of the monetary account that's being shared.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The user who created the share.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_created")]
         public LabelUser UserAliasCreated { get; set; }
-
+    
         /// <summary>
         /// The user who revoked the share.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_revoked")]
         public LabelUser UserAliasRevoked { get; set; }
-
+    
         /// <summary>
         /// The id of the monetary account the share applies to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The id of the newly created share invite.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
-
+    
+    
         /// <summary>
         /// [DEPRECATED - use /share-invite-monetary-account-response] Create a new share inquiry for a monetary
         /// account, specifying the permission the other bunq user will have on it.
@@ -137,53 +135,43 @@ public class ShareInviteMonetaryAccountInquiry : BunqModel
         /// <param name="shareType">The share type, either STANDARD or MUTUAL.</param>
         /// <param name="startDate">The start date of this share.</param>
         /// <param name="endDate">The expiration date of this share.</param>
-        public static BunqResponse<int> Create(Pointer counterUserAlias, ShareDetail shareDetail, string status,
-            int? monetaryAccountId = null, int? draftShareInviteBankId = null, string relationship = null,
-            string shareType = null, string startDate = null, string endDate = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(Pointer counterUserAlias, ShareDetail shareDetail, string status, int? monetaryAccountId= null, int? draftShareInviteBankId = 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-
+    
             var requestMap = new Dictionary<string, object>
-            {
-                {FIELD_COUNTER_USER_ALIAS, counterUserAlias},
-                {FIELD_DRAFT_SHARE_INVITE_BANK_ID, draftShareInviteBankId},
-                {FIELD_SHARE_DETAIL, shareDetail},
-                {FIELD_STATUS, status},
-                {FIELD_RELATIONSHIP, relationship},
-                {FIELD_SHARE_TYPE, shareType},
-                {FIELD_START_DATE, startDate},
-                {FIELD_END_DATE, endDate},
-            };
-
+    {
+    {FIELD_COUNTER_USER_ALIAS, counterUserAlias},
+    {FIELD_DRAFT_SHARE_INVITE_BANK_ID, draftShareInviteBankId},
+    {FIELD_SHARE_DETAIL, shareDetail},
+    {FIELD_STATUS, status},
+    {FIELD_RELATIONSHIP, relationship},
+    {FIELD_SHARE_TYPE, shareType},
+    {FIELD_START_DATE, startDate},
+    {FIELD_END_DATE, endDate},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// [DEPRECATED - use /share-invite-monetary-account-response] Get the details of a specific share inquiry.
         /// </summary>
-        public static BunqResponse<ShareInviteMonetaryAccountInquiry> Get(int shareInviteMonetaryAccountInquiryId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ShareInviteMonetaryAccountInquiry> Get(int shareInviteMonetaryAccountInquiryId, int? 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),
-                        shareInviteMonetaryAccountInquiryId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), shareInviteMonetaryAccountInquiryId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<ShareInviteMonetaryAccountInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// [DEPRECATED - use /share-invite-monetary-account-response] Update the details of a share. This includes
         /// updating status (revoking or cancelling it), granted permission and validity period of this share.
@@ -192,51 +180,42 @@ public static BunqResponse<ShareInviteMonetaryAccountInquiry> Get(int shareInvit
         /// <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="startDate">The start date of this share.</param>
         /// <param name="endDate">The expiration date of this share.</param>
-        public static BunqResponse<int> Update(int shareInviteMonetaryAccountInquiryId, int? monetaryAccountId = null,
-            ShareDetail shareDetail = null, string status = null, string startDate = null, string endDate = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int shareInviteMonetaryAccountInquiryId, int? monetaryAccountId= null, ShareDetail shareDetail = null, string status = null, string startDate = null, string endDate = 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_SHARE_DETAIL, shareDetail},
-                {FIELD_STATUS, status},
-                {FIELD_START_DATE, startDate},
-                {FIELD_END_DATE, endDate},
-            };
-
+    {
+    {FIELD_SHARE_DETAIL, shareDetail},
+    {FIELD_STATUS, status},
+    {FIELD_START_DATE, startDate},
+    {FIELD_END_DATE, endDate},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        shareInviteMonetaryAccountInquiryId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), shareInviteMonetaryAccountInquiryId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// [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<ShareInviteMonetaryAccountInquiry>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ShareInviteMonetaryAccountInquiry>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<ShareInviteMonetaryAccountInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -245,75 +224,75 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.UserAliasCreated != null)
             {
                 return false;
             }
-
+    
             if (this.UserAliasRevoked != null)
             {
                 return false;
             }
-
+    
             if (this.CounterUserAlias != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.DraftShareInviteBankId != null)
             {
                 return false;
             }
-
+    
             if (this.ShareDetail != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.Relationship != null)
             {
                 return false;
             }
-
+    
             if (this.ShareType != null)
             {
                 return false;
             }
-
+    
             if (this.StartDate != null)
             {
                 return false;
             }
-
+    
             if (this.EndDate != null)
             {
                 return false;
             }
-
+    
             if (this.Id != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ShareInviteMonetaryAccountInquiry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ShareInviteMonetaryAccountInquiry>(json);
+            return BunqModel.CreateFromJsonString<ShareInviteMonetaryAccountInquiry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountResponse.cs b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountResponse.cs
index cf80eb3..7cf5cf2 100644
--- a/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountResponse.cs
+++ b/BunqSdk/Model/Generated/Endpoint/ShareInviteMonetaryAccountResponse.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,18 +22,18 @@ public class ShareInviteMonetaryAccountResponse : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/share-invite-monetary-account-response/{1}";
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/share-invite-monetary-account-response/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/share-invite-monetary-account-response";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_STATUS = "status";
         public const string FIELD_CARD_ID = "card_id";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "ShareInviteMonetaryAccountResponse";
-
+    
         /// <summary>
         /// 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,
@@ -39,152 +41,143 @@ public class ShareInviteMonetaryAccountResponse : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// 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; }
-
+    
         /// <summary>
         /// The id of the ShareInviteBankResponse.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the ShareInviteBankResponse creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the ShareInviteBankResponse last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The monetary account and user who created the share.
         /// </summary>
         [JsonProperty(PropertyName = "counter_alias")]
         public MonetaryAccountReference CounterAlias { get; set; }
-
+    
         /// <summary>
         /// The user who cancelled the share if it has been revoked or rejected.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_cancelled")]
         public LabelUser UserAliasCancelled { get; set; }
-
+    
         /// <summary>
         /// The id of the monetary account the ACCEPTED share applies to. null otherwise.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? 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; }
-
+    
         /// <summary>
         /// The share details.
         /// </summary>
         [JsonProperty(PropertyName = "share_detail")]
         public ShareDetail ShareDetail { get; set; }
-
+    
         /// <summary>
         /// All of the relation users towards this MA.
         /// </summary>
         [JsonProperty(PropertyName = "relation_user")]
         public RelationUser RelationUser { get; set; }
-
+    
         /// <summary>
         /// The share type, either STANDARD or MUTUAL.
         /// </summary>
         [JsonProperty(PropertyName = "share_type")]
         public string ShareType { get; set; }
-
+    
         /// <summary>
         /// The start date of this share.
         /// </summary>
         [JsonProperty(PropertyName = "start_date")]
         public string StartDate { get; set; }
-
+    
         /// <summary>
         /// The expiration date of this share.
         /// </summary>
         [JsonProperty(PropertyName = "end_date")]
         public string EndDate { get; set; }
-
+    
         /// <summary>
         /// The description of this share. It is basically the monetary account description.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
-
+    
+    
         /// <summary>
         /// Return the details of a specific share a user was invited to.
         /// </summary>
-        public static BunqResponse<ShareInviteMonetaryAccountResponse> Get(int shareInviteMonetaryAccountResponseId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<ShareInviteMonetaryAccountResponse> Get(int shareInviteMonetaryAccountResponseId, 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(), shareInviteMonetaryAccountResponseId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), shareInviteMonetaryAccountResponseId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<ShareInviteMonetaryAccountResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Accept or reject a share a user was invited to.
         /// </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<int> Update(int shareInviteMonetaryAccountResponseId, string status = null, int? cardId = 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},
-                {FIELD_CARD_ID, cardId},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    {FIELD_CARD_ID, cardId},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), shareInviteMonetaryAccountResponseId),
-                    requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), shareInviteMonetaryAccountResponseId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Return all the shares a user was invited to.
         /// </summary>
-        public static BunqResponse<List<ShareInviteMonetaryAccountResponse>> List(
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<ShareInviteMonetaryAccountResponse>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<ShareInviteMonetaryAccountResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -193,80 +186,80 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.CounterAlias != null)
             {
                 return false;
             }
-
+    
             if (this.UserAliasCancelled != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.DraftShareInviteBankId != null)
             {
                 return false;
             }
-
+    
             if (this.ShareDetail != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.RelationUser != null)
             {
                 return false;
             }
-
+    
             if (this.ShareType != null)
             {
                 return false;
             }
-
+    
             if (this.StartDate != null)
             {
                 return false;
             }
-
+    
             if (this.EndDate != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ShareInviteMonetaryAccountResponse CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ShareInviteMonetaryAccountResponse>(json);
+            return BunqModel.CreateFromJsonString<ShareInviteMonetaryAccountResponse>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/SofortMerchantTransaction.cs b/BunqSdk/Model/Generated/Endpoint/SofortMerchantTransaction.cs
index c19f50e..072f14b 100644
--- a/BunqSdk/Model/Generated/Endpoint/SofortMerchantTransaction.cs
+++ b/BunqSdk/Model/Generated/Endpoint/SofortMerchantTransaction.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,113 +20,105 @@ public class SofortMerchantTransaction : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/sofort-merchant-transaction/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/sofort-merchant-transaction";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_AMOUNT_REQUESTED = "amount_requested";
         public const string FIELD_ISSUER = "issuer";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "SofortMerchantTransaction";
-
+    
         /// <summary>
         /// The requested amount of money to add.
         /// </summary>
         [JsonProperty(PropertyName = "amount_requested")]
         public Amount AmountRequested { get; set; }
-
+    
         /// <summary>
         /// The BIC of the issuer.
         /// </summary>
         [JsonProperty(PropertyName = "issuer")]
         public string Issuer { get; set; }
-
+    
         /// <summary>
         /// The id of the monetary account this sofort merchant transaction links to.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The alias of the monetary account to add money to.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The alias of the monetary account the money comes from.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// In case of a successful transaction, the amount of money that will be transferred.
         /// </summary>
         [JsonProperty(PropertyName = "amount_guaranteed")]
         public Amount AmountGuaranteed { get; set; }
-
+    
         /// <summary>
         /// The URL to visit to 
         /// </summary>
         [JsonProperty(PropertyName = "issuer_authentication_url")]
         public string IssuerAuthenticationUrl { get; set; }
-
+    
         /// <summary>
         /// The status of the transaction.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The error message of the transaction.
         /// </summary>
         [JsonProperty(PropertyName = "error_message")]
         public List<Error> ErrorMessage { get; set; }
-
+    
         /// <summary>
         /// The 'transaction ID' of the Sofort transaction.
         /// </summary>
         [JsonProperty(PropertyName = "transaction_identifier")]
         public string TransactionIdentifier { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<SofortMerchantTransaction> Get(int sofortMerchantTransactionId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<SofortMerchantTransaction> Get(int sofortMerchantTransactionId, int? 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),
-                        sofortMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), sofortMerchantTransactionId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<SofortMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<SofortMerchantTransaction>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<SofortMerchantTransaction>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<SofortMerchantTransaction>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -131,60 +127,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.AmountGuaranteed != null)
             {
                 return false;
             }
-
+    
             if (this.AmountRequested != null)
             {
                 return false;
             }
-
+    
             if (this.Issuer != null)
             {
                 return false;
             }
-
+    
             if (this.IssuerAuthenticationUrl != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.ErrorMessage != null)
             {
                 return false;
             }
-
+    
             if (this.TransactionIdentifier != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static SofortMerchantTransaction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<SofortMerchantTransaction>(json);
+            return BunqModel.CreateFromJsonString<SofortMerchantTransaction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Tab.cs b/BunqSdk/Model/Generated/Endpoint/Tab.cs
index 3772e40..f4f44a3 100644
--- a/BunqSdk/Model/Generated/Endpoint/Tab.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Tab.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -19,65 +23,57 @@ public class Tab : BunqModel, IAnchorObjectInterface
         /// 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_READ = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register/{2}/tab";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "Tab";
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TabUsageSingle")]
         public TabUsageSingle TabUsageSingle { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TabUsageMultiple")]
         public TabUsageMultiple TabUsageMultiple { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get a specific tab. This returns a TabUsageSingle or TabUsageMultiple.
         /// </summary>
-        public static BunqResponse<Tab> Get(int cashRegisterId, string tabUuid, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<Tab> Get(int cashRegisterId, string tabUuid, int? 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),
-                        cashRegisterId, tabUuid), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<Tab>(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a collection of tabs.
         /// </summary>
-        public static BunqResponse<List<Tab>> List(int cashRegisterId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<Tab>> List(int cashRegisterId, int? 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), cashRegisterId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), urlParams, customHeaders);
+    
             return FromJsonList<Tab>(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -86,15 +82,15 @@ public BunqModel GetReferencedObject()
             {
                 return this.TabUsageSingle;
             }
-
+    
             if (this.TabUsageMultiple != null)
             {
                 return this.TabUsageMultiple;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -103,20 +99,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TabUsageMultiple != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Tab CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Tab>(json);
+            return BunqModel.CreateFromJsonString<Tab>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabAttachmentTab.cs b/BunqSdk/Model/Generated/Endpoint/TabAttachmentTab.cs
index 6f18858..c915bfb 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabAttachmentTab.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabAttachmentTab.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,53 +19,51 @@ public class TabAttachmentTab : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_READ = "tab/{0}/attachment/{1}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TabAttachmentTab";
-
+    
         /// <summary>
         /// The id of the attachment.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the attachment's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the attachment's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The attachment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public Attachment Attachment { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get a specific attachment. The header of the response contains the content-type of the attachment.
         /// </summary>
-        public static BunqResponse<TabAttachmentTab> Get(string tabUuid, int tabAttachmentTabId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TabAttachmentTab> Get(string tabUuid, int tabAttachmentTabId, 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, tabUuid, tabAttachmentTabId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, tabUuid, tabAttachmentTabId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TabAttachmentTab>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -70,30 +72,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabAttachmentTab CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabAttachmentTab>(json);
+            return BunqModel.CreateFromJsonString<TabAttachmentTab>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabAttachmentTabContent.cs b/BunqSdk/Model/Generated/Endpoint/TabAttachmentTabContent.cs
index 9a6f62e..5bc2389 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabAttachmentTabContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabAttachmentTabContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,40 +19,38 @@ public class TabAttachmentTabContent : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "tab/{0}/attachment/{1}/content";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TabAttachmentTabContent";
-
+    
         /// <summary>
         /// Get the raw content of a specific attachment.
         /// </summary>
-        public static BunqResponse<byte[]> List(string tabUuid, int attachmentId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(string tabUuid, int attachmentId, 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_LISTING, tabUuid, attachmentId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, tabUuid, attachmentId), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabAttachmentTabContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabAttachmentTabContent>(json);
+            return BunqModel.CreateFromJsonString<TabAttachmentTabContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabItem.cs b/BunqSdk/Model/Generated/Endpoint/TabItem.cs
index 3343d1d..424e3e0 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabItem.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabItem.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -15,45 +15,46 @@ public class TabItem : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The item's brief description.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The item's EAN code.
         /// </summary>
         [JsonProperty(PropertyName = "ean_code")]
         public string EanCode { get; set; }
-
+    
         /// <summary>
         /// A struct with an AttachmentPublic UUID that used as an avatar for the TabItem.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_attachment")]
         public AttachmentPublic AvatarAttachment { get; set; }
-
+    
         /// <summary>
         /// A list of AttachmentTab attached to the TabItem.
         /// </summary>
         [JsonProperty(PropertyName = "tab_attachment")]
         public List<AttachmentTab> TabAttachment { get; set; }
-
+    
         /// <summary>
         /// The quantity of the item. Formatted as a number containing up to 15 digits, up to 15 decimals and using a
         /// dot.
         /// </summary>
         [JsonProperty(PropertyName = "quantity")]
         public string Quantity { get; set; }
-
+    
         /// <summary>
         /// The money amount of the item.
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -62,45 +63,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.EanCode != null)
             {
                 return false;
             }
-
+    
             if (this.AvatarAttachment != null)
             {
                 return false;
             }
-
+    
             if (this.TabAttachment != null)
             {
                 return false;
             }
-
+    
             if (this.Quantity != null)
             {
                 return false;
             }
-
+    
             if (this.Amount != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabItem CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabItem>(json);
+            return BunqModel.CreateFromJsonString<TabItem>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabItemShop.cs b/BunqSdk/Model/Generated/Endpoint/TabItemShop.cs
index 7ba5e88..e5e6a6d 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabItemShop.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabItemShop.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,15 +23,11 @@ public class TabItemShop : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item/{4}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item/{4}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item/{4}";
-
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item/{4}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item/{4}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item/{4}";
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -39,61 +37,61 @@ public class TabItemShop : BunqModel
         public const string FIELD_TAB_ATTACHMENT = "tab_attachment";
         public const string FIELD_QUANTITY = "quantity";
         public const string FIELD_AMOUNT = "amount";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TabItem";
-
+    
         /// <summary>
         /// The TabItem's brief description.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The TabItem's EAN code.
         /// </summary>
         [JsonProperty(PropertyName = "ean_code")]
         public string EanCode { get; set; }
-
+    
         /// <summary>
         /// An AttachmentPublic UUID that used as an avatar for the TabItem.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_attachment_uuid")]
         public string AvatarAttachmentUuid { get; set; }
-
+    
         /// <summary>
         /// A list of AttachmentTab attached to the TabItem.
         /// </summary>
         [JsonProperty(PropertyName = "tab_attachment")]
         public List<AttachmentTab> TabAttachment { get; set; }
-
+    
         /// <summary>
         /// The quantity of the TabItem.
         /// </summary>
         [JsonProperty(PropertyName = "quantity")]
         public double? Quantity { get; set; }
-
+    
         /// <summary>
         /// The money amount of the TabItem.
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { get; set; }
-
+    
         /// <summary>
         /// The id of the created TabItem.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// A struct with an AttachmentPublic UUID that used as an avatar for the TabItem.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_attachment")]
         public AttachmentPublic AvatarAttachment { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a new TabItem for a given Tab.
         /// </summary>
@@ -103,34 +101,28 @@ public class TabItemShop : BunqModel
         /// <param name="tabAttachment">A list of AttachmentTab attached to the TabItem.</param>
         /// <param name="quantity">The quantity of the TabItem. Formatted as a number containing up to 15 digits, up to 15 decimals and using a dot.</param>
         /// <param name="amount">The money amount of the TabItem. Will not change the value of the corresponding Tab.</param>
-        public static BunqResponse<int> Create(int cashRegisterId, string tabUuid, string description,
-            int? monetaryAccountId = null, string eanCode = null, string avatarAttachmentUuid = null,
-            List<int?> tabAttachment = null, string quantity = null, Amount amount = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int cashRegisterId, string tabUuid, string description, int? monetaryAccountId= null, string eanCode = null, string avatarAttachmentUuid = null, List<int?> tabAttachment = null, string quantity = null, Amount amount = 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_EAN_CODE, eanCode},
-                {FIELD_AVATAR_ATTACHMENT_UUID, avatarAttachmentUuid},
-                {FIELD_TAB_ATTACHMENT, tabAttachment},
-                {FIELD_QUANTITY, quantity},
-                {FIELD_AMOUNT, amount},
-            };
-
+    {
+    {FIELD_DESCRIPTION, description},
+    {FIELD_EAN_CODE, eanCode},
+    {FIELD_AVATAR_ATTACHMENT_UUID, avatarAttachmentUuid},
+    {FIELD_TAB_ATTACHMENT, tabAttachment},
+    {FIELD_QUANTITY, quantity},
+    {FIELD_AMOUNT, amount},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId, tabUuid), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Modify a TabItem from a given Tab.
         /// </summary>
@@ -140,89 +132,69 @@ public static BunqResponse<int> Create(int cashRegisterId, string tabUuid, strin
         /// <param name="tabAttachment">A list of AttachmentTab attached to the TabItem.</param>
         /// <param name="quantity">The quantity of the TabItem. Formatted as a number containing up to 15 digits, up to 15 decimals and using a dot.</param>
         /// <param name="amount">The money amount of the TabItem. Will not change the value of the corresponding Tab.</param>
-        public static BunqResponse<int> Update(int cashRegisterId, string tabUuid, int tabItemShopId,
-            int? monetaryAccountId = null, string description = null, string eanCode = null,
-            string avatarAttachmentUuid = null, List<int?> tabAttachment = null, string quantity = null,
-            Amount amount = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int cashRegisterId, string tabUuid, int tabItemShopId, int? monetaryAccountId= null, string description = null, string eanCode = null, string avatarAttachmentUuid = null, List<int?> tabAttachment = null, string quantity = null, Amount amount = 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_EAN_CODE, eanCode},
-                {FIELD_AVATAR_ATTACHMENT_UUID, avatarAttachmentUuid},
-                {FIELD_TAB_ATTACHMENT, tabAttachment},
-                {FIELD_QUANTITY, quantity},
-                {FIELD_AMOUNT, amount},
-            };
-
+    {
+    {FIELD_DESCRIPTION, description},
+    {FIELD_EAN_CODE, eanCode},
+    {FIELD_AVATAR_ATTACHMENT_UUID, avatarAttachmentUuid},
+    {FIELD_TAB_ATTACHMENT, tabAttachment},
+    {FIELD_QUANTITY, quantity},
+    {FIELD_AMOUNT, amount},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId, tabUuid, tabItemShopId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid, tabItemShopId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// Delete a specific TabItem from a Tab.
         /// </summary>
-        public static BunqResponse<object> Delete(int cashRegisterId, string tabUuid, int tabItemShopId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int cashRegisterId, string tabUuid, int tabItemShopId, int? 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),
-                        cashRegisterId, tabUuid, tabItemShopId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid, tabItemShopId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Get a collection of TabItems from a given Tab.
         /// </summary>
-        public static BunqResponse<List<TabItemShop>> List(int cashRegisterId, string tabUuid,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TabItemShop>> List(int cashRegisterId, string tabUuid, int? 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), cashRegisterId, tabUuid), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid), urlParams, customHeaders);
+    
             return FromJsonList<TabItemShop>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a specific TabItem from a given Tab.
         /// </summary>
-        public static BunqResponse<TabItemShop> Get(int cashRegisterId, string tabUuid, int tabItemShopId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TabItemShop> Get(int cashRegisterId, string tabUuid, int tabItemShopId, int? 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),
-                        cashRegisterId, tabUuid, tabItemShopId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid, tabItemShopId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TabItemShop>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -231,45 +203,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.EanCode != null)
             {
                 return false;
             }
-
+    
             if (this.AvatarAttachment != null)
             {
                 return false;
             }
-
+    
             if (this.TabAttachment != null)
             {
                 return false;
             }
-
+    
             if (this.Quantity != null)
             {
                 return false;
             }
-
+    
             if (this.Amount != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabItemShop CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabItemShop>(json);
+            return BunqModel.CreateFromJsonString<TabItemShop>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabItemShopBatch.cs b/BunqSdk/Model/Generated/Endpoint/TabItemShopBatch.cs
index c5adc46..e440dad 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabItemShopBatch.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabItemShopBatch.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -15,47 +17,42 @@ public class TabItemShopBatch : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item-batch";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-item-batch";
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_TAB_ITEMS = "tab_items";
-
-
+    
+    
         /// <summary>
         /// The list of tab items in the batch.
         /// </summary>
         [JsonProperty(PropertyName = "tab_items")]
         public List<TabItemShop> TabItems { get; set; }
-
+    
         /// <summary>
         /// Create tab items as a batch.
         /// </summary>
         /// <param name="tabItems">The list of tab items we want to create in a single batch. Limited to 50 items per batch.</param>
-        public static BunqResponse<int> Create(int cashRegisterId, string tabUuid, List<TabItemShop> tabItems,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int cashRegisterId, string tabUuid, List<TabItemShop> tabItems, int? 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>
-            {
-                {FIELD_TAB_ITEMS, tabItems},
-            };
-
+    {
+    {FIELD_TAB_ITEMS, tabItems},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId, tabUuid), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -64,15 +61,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabItemShopBatch CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabItemShopBatch>(json);
+            return BunqModel.CreateFromJsonString<TabItemShopBatch>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabQrCodeContent.cs b/BunqSdk/Model/Generated/Endpoint/TabQrCodeContent.cs
index 409a583..e850ac6 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabQrCodeContent.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabQrCodeContent.cs
@@ -1,6 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -13,46 +18,40 @@ public class TabQrCodeContent : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/qr-code-content";
-
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/qr-code-content";
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TabQrCodeContent";
-
+    
         /// <summary>
         /// Returns the raw content of the QR code that links to this Tab. The raw content is the binary representation
         /// of a file, without any JSON wrapping.
         /// </summary>
-        public static BunqResponse<byte[]> List(int cashRegisterId, string tabUuid, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<byte[]> List(int cashRegisterId, string tabUuid, int? 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_LISTING, DetermineUserId(),
-                        DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid), new Dictionary<string, string>(), customHeaders);
+    
             return new BunqResponse<byte[]>(responseRaw.BodyBytes, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabQrCodeContent CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabQrCodeContent>(json);
+            return BunqModel.CreateFromJsonString<TabQrCodeContent>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabResultInquiry.cs b/BunqSdk/Model/Generated/Endpoint/TabResultInquiry.cs
index 9c5c4e4..349dd97 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabResultInquiry.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabResultInquiry.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,67 +18,55 @@ public class TabResultInquiry : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-result-inquiry/{4}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-result-inquiry";
-
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-result-inquiry/{4}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register/{2}/tab/{3}/tab-result-inquiry";
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TabResultInquiry";
-
+    
         /// <summary>
         /// The Tab details.
         /// </summary>
         [JsonProperty(PropertyName = "tab")]
         public Tab Tab { get; set; }
-
+    
         /// <summary>
         /// The payment made for the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "payment")]
         public Payment Payment { get; set; }
-
-
+    
+    
         /// <summary>
         /// Used to view a single TabResultInquiry belonging to a tab.
         /// </summary>
-        public static BunqResponse<TabResultInquiry> Get(int cashRegisterId, string tabUuid, int tabResultInquiryId,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TabResultInquiry> Get(int cashRegisterId, string tabUuid, int tabResultInquiryId, int? 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),
-                        cashRegisterId, tabUuid, tabResultInquiryId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid, tabResultInquiryId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TabResultInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Used to view a list of TabResultInquiry objects belonging to a tab.
         /// </summary>
-        public static BunqResponse<List<TabResultInquiry>> List(int cashRegisterId, string tabUuid,
-            int? monetaryAccountId = null, IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TabResultInquiry>> List(int cashRegisterId, string tabUuid, int? 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), cashRegisterId, tabUuid), urlParams,
-                    customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUuid), urlParams, customHeaders);
+    
             return FromJsonList<TabResultInquiry>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -83,20 +75,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Payment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabResultInquiry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabResultInquiry>(json);
+            return BunqModel.CreateFromJsonString<TabResultInquiry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabResultResponse.cs b/BunqSdk/Model/Generated/Endpoint/TabResultResponse.cs
index 0eec9a2..bb72530 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabResultResponse.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabResultResponse.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -17,67 +21,59 @@ public class TabResultResponse : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/tab-result-response/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/tab-result-response";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TabResultResponse";
-
+    
         /// <summary>
         /// The Tab details.
         /// </summary>
         [JsonProperty(PropertyName = "tab")]
         public Tab Tab { get; set; }
-
+    
         /// <summary>
         /// The payment made for the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
         [JsonProperty(PropertyName = "request_reference_split_the_bill")]
         public List<RequestInquiryReference> RequestReferenceSplitTheBill { get; set; }
-
-
+    
+    
         /// <summary>
         /// Used to view a single TabResultResponse belonging to a tab.
         /// </summary>
-        public static BunqResponse<TabResultResponse> Get(int tabResultResponseId, int? monetaryAccountId = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TabResultResponse> Get(int tabResultResponseId, int? 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),
-                        tabResultResponseId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), tabResultResponseId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TabResultResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Used to view a list of TabResultResponse objects belonging to a tab.
         /// </summary>
-        public static BunqResponse<List<TabResultResponse>> List(int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TabResultResponse>> List(int? 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);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId)), urlParams, customHeaders);
+    
             return FromJsonList<TabResultResponse>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -86,25 +82,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Payment != null)
             {
                 return false;
             }
-
+    
             if (this.RequestReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabResultResponse CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabResultResponse>(json);
+            return BunqModel.CreateFromJsonString<TabResultResponse>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabUsageMultiple.cs b/BunqSdk/Model/Generated/Endpoint/TabUsageMultiple.cs
index 4dbe3d6..84e6c81 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabUsageMultiple.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabUsageMultiple.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -21,17 +23,12 @@ public class TabUsageMultiple : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple/{3}";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple/{3}";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-multiple";
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -47,138 +44,138 @@ public class TabUsageMultiple : BunqModel
         public const string FIELD_VISIBILITY = "visibility";
         public const string FIELD_EXPIRATION = "expiration";
         public const string FIELD_TAB_ATTACHMENT = "tab_attachment";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "Uuid";
         private const string OBJECT_TYPE_PUT = "Uuid";
         private const string OBJECT_TYPE_GET = "TabUsageMultiple";
-
+    
         /// <summary>
         /// The description of the TabUsageMultiple. Maximum 9000 characters.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The status of the Tab. Can be OPEN, PAYABLE or CLOSED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The total amount of the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "amount_total")]
         public Amount AmountTotal { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not a higher amount can be paid.
         /// </summary>
         [JsonProperty(PropertyName = "allow_amount_higher")]
         public bool? AllowAmountHigher { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not a lower amount can be paid.
         /// </summary>
         [JsonProperty(PropertyName = "allow_amount_lower")]
         public bool? AllowAmountLower { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not the user paying the Tab should be asked if he wants to give a tip. When want_tip
         /// is set to true, allow_amount_higher must also be set to true and allow_amount_lower must be false.
         /// </summary>
         [JsonProperty(PropertyName = "want_tip")]
         public bool? WantTip { get; set; }
-
+    
         /// <summary>
         /// The minimum age of the user paying the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "minimum_age")]
         public bool? MinimumAge { get; set; }
-
+    
         /// <summary>
         /// Whether or not an billing and shipping address must be provided when paying the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "require_address")]
         public string RequireAddress { get; set; }
-
+    
         /// <summary>
         /// The URL which the user is sent to after paying the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "redirect_url")]
         public string RedirectUrl { get; set; }
-
+    
         /// <summary>
         /// The visibility of a Tab. A Tab can be visible trough NearPay, the QR code of the CashRegister and its own QR
         /// code.
         /// </summary>
         [JsonProperty(PropertyName = "visibility")]
         public TabVisibility Visibility { get; set; }
-
+    
         /// <summary>
         /// The moment when this Tab expires.
         /// </summary>
         [JsonProperty(PropertyName = "expiration")]
         public string Expiration { get; set; }
-
+    
         /// <summary>
         /// An array of attachments that describe the tab. Viewable through the GET
         /// /tab/{tabid}/attachment/{attachmentid}/content endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "tab_attachment")]
         public List<BunqId> TabAttachment { get; set; }
-
+    
         /// <summary>
         /// The uuid of the created TabUsageMultiple.
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the Tab's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the Tab's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The token used to redirect mobile devices directly to the bunq app. Because they can't scan a QR code.
         /// </summary>
         [JsonProperty(PropertyName = "qr_code_token")]
         public string QrCodeToken { get; set; }
-
+    
         /// <summary>
         /// The URL redirecting user to the tab payment in the bunq app. Only works on mobile devices.
         /// </summary>
         [JsonProperty(PropertyName = "tab_url")]
         public string TabUrl { get; set; }
-
+    
         /// <summary>
         /// The alias of the party that owns this tab.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The location of the cash register that created this tab.
         /// </summary>
         [JsonProperty(PropertyName = "cash_register_location")]
         public Geolocation CashRegisterLocation { get; set; }
-
+    
         /// <summary>
         /// The tab items of this tab.
         /// </summary>
         [JsonProperty(PropertyName = "tab_item")]
         public List<TabItem> TabItem { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a TabUsageMultiple. On creation the status must be set to OPEN
         /// </summary>
@@ -194,41 +191,34 @@ public class TabUsageMultiple : BunqModel
         /// <param name="visibility">The visibility of a Tab. A Tab can be visible trough NearPay, the QR code of the CashRegister and its own QR code.</param>
         /// <param name="expiration">The moment when this Tab expires. Can be at most 365 days into the future.</param>
         /// <param name="tabAttachment">An array of attachments that describe the tab. Uploaded through the POST /user/{userid}/attachment-tab endpoint.</param>
-        public static BunqResponse<string> Create(int cashRegisterId, string description, string status,
-            Amount amountTotal, int? monetaryAccountId = null, bool? allowAmountHigher = null,
-            bool? allowAmountLower = null, bool? wantTip = null, int? minimumAge = null, string requireAddress = null,
-            string redirectUrl = null, TabVisibility visibility = null, string expiration = null,
-            List<BunqId> tabAttachment = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<string> Create(int cashRegisterId, string description, string status, Amount amountTotal, int? monetaryAccountId= null, bool? allowAmountHigher = null, bool? allowAmountLower = null, bool? wantTip = null, int? minimumAge = null, string requireAddress = null, string redirectUrl = null, TabVisibility visibility = null, string expiration = null, List<BunqId> tabAttachment = 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_STATUS, status},
-                {FIELD_AMOUNT_TOTAL, amountTotal},
-                {FIELD_ALLOW_AMOUNT_HIGHER, allowAmountHigher},
-                {FIELD_ALLOW_AMOUNT_LOWER, allowAmountLower},
-                {FIELD_WANT_TIP, wantTip},
-                {FIELD_MINIMUM_AGE, minimumAge},
-                {FIELD_REQUIRE_ADDRESS, requireAddress},
-                {FIELD_REDIRECT_URL, redirectUrl},
-                {FIELD_VISIBILITY, visibility},
-                {FIELD_EXPIRATION, expiration},
-                {FIELD_TAB_ATTACHMENT, tabAttachment},
-            };
-
+    {
+    {FIELD_DESCRIPTION, description},
+    {FIELD_STATUS, status},
+    {FIELD_AMOUNT_TOTAL, amountTotal},
+    {FIELD_ALLOW_AMOUNT_HIGHER, allowAmountHigher},
+    {FIELD_ALLOW_AMOUNT_LOWER, allowAmountLower},
+    {FIELD_WANT_TIP, wantTip},
+    {FIELD_MINIMUM_AGE, minimumAge},
+    {FIELD_REQUIRE_ADDRESS, requireAddress},
+    {FIELD_REDIRECT_URL, redirectUrl},
+    {FIELD_VISIBILITY, visibility},
+    {FIELD_EXPIRATION, expiration},
+    {FIELD_TAB_ATTACHMENT, tabAttachment},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), requestBytes, customHeaders);
+    
             return ProcessForUuid(responseRaw);
         }
-
+    
         /// <summary>
         /// Modify a specific TabUsageMultiple. You can change the amount_total, status and visibility. Once you change
         /// the status to PAYABLE the TabUsageMultiple will expire after a year (default). If you've created any
@@ -240,86 +230,68 @@ public static BunqResponse<string> Create(int cashRegisterId, string description
         /// <param name="visibility">The visibility of a Tab. A Tab can be visible trough NearPay, the QR code of the CashRegister and its own QR code.</param>
         /// <param name="expiration">The moment when this Tab expires. Can be at most 365 days into the future.</param>
         /// <param name="tabAttachment">An array of attachments that describe the tab. Uploaded through the POST /user/{userid}/attachment-tab endpoint.</param>
-        public static BunqResponse<string> Update(int cashRegisterId, string tabUsageMultipleUuid,
-            int? monetaryAccountId = null, string status = null, Amount amountTotal = null,
-            TabVisibility visibility = null, string expiration = null, List<BunqId> tabAttachment = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<string> Update(int cashRegisterId, string tabUsageMultipleUuid, int? monetaryAccountId= null, string status = null, Amount amountTotal = null, TabVisibility visibility = null, string expiration = null, List<BunqId> tabAttachment = 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},
-                {FIELD_AMOUNT_TOTAL, amountTotal},
-                {FIELD_VISIBILITY, visibility},
-                {FIELD_EXPIRATION, expiration},
-                {FIELD_TAB_ATTACHMENT, tabAttachment},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    {FIELD_AMOUNT_TOTAL, amountTotal},
+    {FIELD_VISIBILITY, visibility},
+    {FIELD_EXPIRATION, expiration},
+    {FIELD_TAB_ATTACHMENT, tabAttachment},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId, tabUsageMultipleUuid), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUsageMultipleUuid), requestBytes, customHeaders);
+    
             return ProcessForUuid(responseRaw);
         }
-
+    
         /// <summary>
         /// Close a specific TabUsageMultiple.
         /// </summary>
-        public static BunqResponse<object> Delete(int cashRegisterId, string tabUsageMultipleUuid,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int cashRegisterId, string tabUsageMultipleUuid, int? 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),
-                        cashRegisterId, tabUsageMultipleUuid), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUsageMultipleUuid), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Get a specific TabUsageMultiple.
         /// </summary>
-        public static BunqResponse<TabUsageMultiple> Get(int cashRegisterId, string tabUsageMultipleUuid,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TabUsageMultiple> Get(int cashRegisterId, string tabUsageMultipleUuid, int? 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),
-                        cashRegisterId, tabUsageMultipleUuid), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUsageMultipleUuid), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TabUsageMultiple>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a collection of TabUsageMultiple.
         /// </summary>
-        public static BunqResponse<List<TabUsageMultiple>> List(int cashRegisterId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TabUsageMultiple>> List(int cashRegisterId, int? 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), cashRegisterId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), urlParams, customHeaders);
+    
             return FromJsonList<TabUsageMultiple>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -328,95 +300,95 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.AmountTotal != null)
             {
                 return false;
             }
-
+    
             if (this.QrCodeToken != null)
             {
                 return false;
             }
-
+    
             if (this.TabUrl != null)
             {
                 return false;
             }
-
+    
             if (this.Visibility != null)
             {
                 return false;
             }
-
+    
             if (this.MinimumAge != null)
             {
                 return false;
             }
-
+    
             if (this.RequireAddress != null)
             {
                 return false;
             }
-
+    
             if (this.RedirectUrl != null)
             {
                 return false;
             }
-
+    
             if (this.Expiration != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CashRegisterLocation != null)
             {
                 return false;
             }
-
+    
             if (this.TabItem != null)
             {
                 return false;
             }
-
+    
             if (this.TabAttachment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabUsageMultiple CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabUsageMultiple>(json);
+            return BunqModel.CreateFromJsonString<TabUsageMultiple>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TabUsageSingle.cs b/BunqSdk/Model/Generated/Endpoint/TabUsageSingle.cs
index ff83249..af82686 100644
--- a/BunqSdk/Model/Generated/Endpoint/TabUsageSingle.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TabUsageSingle.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -22,15 +24,11 @@ public class TabUsageSingle : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single";
-        protected const string ENDPOINT_URL_UPDATE =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single/{3}";
-        protected const string ENDPOINT_URL_DELETE =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single/{3}";
-        protected const string ENDPOINT_URL_READ =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single/{3}";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single";
-
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single/{3}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single/{3}";
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single/{3}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/cash-register/{2}/tab-usage-single";
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -47,150 +45,150 @@ public class TabUsageSingle : BunqModel
         public const string FIELD_VISIBILITY = "visibility";
         public const string FIELD_EXPIRATION = "expiration";
         public const string FIELD_TAB_ATTACHMENT = "tab_attachment";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "Uuid";
         private const string OBJECT_TYPE_PUT = "Uuid";
         private const string OBJECT_TYPE_GET = "TabUsageSingle";
-
+    
         /// <summary>
         /// The merchant reference of the Tab, as defined by the owner.
         /// </summary>
         [JsonProperty(PropertyName = "merchant_reference")]
         public string MerchantReference { get; set; }
-
+    
         /// <summary>
         /// The description of the TabUsageMultiple. Maximum 9000 characters.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The status of the Tab. Can be OPEN, WAITING_FOR_PAYMENT, PAID or CANCELED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The total amount of the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "amount_total")]
         public Amount AmountTotal { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not a higher amount can be paid.
         /// </summary>
         [JsonProperty(PropertyName = "allow_amount_higher")]
         public bool? AllowAmountHigher { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not a lower amount can be paid.
         /// </summary>
         [JsonProperty(PropertyName = "allow_amount_lower")]
         public bool? AllowAmountLower { get; set; }
-
+    
         /// <summary>
         /// [DEPRECATED] Whether or not the user paying the Tab should be asked if he wants to give a tip. When want_tip
         /// is set to true, allow_amount_higher must also be set to true and allow_amount_lower must be false.
         /// </summary>
         [JsonProperty(PropertyName = "want_tip")]
         public bool? WantTip { get; set; }
-
+    
         /// <summary>
         /// The minimum age of the user paying the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "minimum_age")]
         public bool? MinimumAge { get; set; }
-
+    
         /// <summary>
         /// Whether or not an billing and shipping address must be provided when paying the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "require_address")]
         public string RequireAddress { get; set; }
-
+    
         /// <summary>
         /// The URL which the user is sent to after paying the Tab.
         /// </summary>
         [JsonProperty(PropertyName = "redirect_url")]
         public string RedirectUrl { get; set; }
-
+    
         /// <summary>
         /// The visibility of a Tab. A Tab can be visible trough NearPay, the QR code of the CashRegister and its own QR
         /// code.
         /// </summary>
         [JsonProperty(PropertyName = "visibility")]
         public TabVisibility Visibility { get; set; }
-
+    
         /// <summary>
         /// The moment when this Tab expires.
         /// </summary>
         [JsonProperty(PropertyName = "expiration")]
         public string Expiration { get; set; }
-
+    
         /// <summary>
         /// An array of attachments that describe the tab. Uploaded through the POST /user/{userid}/attachment-tab
         /// endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "tab_attachment")]
         public List<BunqId> TabAttachment { get; set; }
-
+    
         /// <summary>
         /// The uuid of the created TabUsageSingle.
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the Tab's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the Tab's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The amount that has been paid for this Tab.
         /// </summary>
         [JsonProperty(PropertyName = "amount_paid")]
         public Amount AmountPaid { get; set; }
-
+    
         /// <summary>
         /// The token used to redirect mobile devices directly to the bunq app. Because they can't scan a QR code.
         /// </summary>
         [JsonProperty(PropertyName = "qr_code_token")]
         public string QrCodeToken { get; set; }
-
+    
         /// <summary>
         /// The URL redirecting user to the tab payment in the bunq app. Only works on mobile devices.
         /// </summary>
         [JsonProperty(PropertyName = "tab_url")]
         public string TabUrl { get; set; }
-
+    
         /// <summary>
         /// The alias of the party that owns this tab.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The location of the cash register that created this tab.
         /// </summary>
         [JsonProperty(PropertyName = "cash_register_location")]
         public Geolocation CashRegisterLocation { get; set; }
-
+    
         /// <summary>
         /// The tab items of this tab.
         /// </summary>
         [JsonProperty(PropertyName = "tab_item")]
         public List<TabItem> TabItem { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a TabUsageSingle. The initial status must be OPEN
         /// </summary>
@@ -207,43 +205,35 @@ public class TabUsageSingle : BunqModel
         /// <param name="visibility">The visibility of a Tab. A Tab can be visible trough NearPay, the QR code of the CashRegister and its own QR code.</param>
         /// <param name="expiration">The moment when this Tab expires. Can be at most 1 hour into the future.</param>
         /// <param name="tabAttachment">An array of attachments that describe the tab. Uploaded through the POST /user/{userid}/attachment-tab endpoint.</param>
-        public static BunqResponse<string> Create(int cashRegisterId, string description, string status,
-            Amount amountTotal, int? monetaryAccountId = null, string merchantReference = null,
-            bool? allowAmountHigher = null, bool? allowAmountLower = null, bool? wantTip = null, int? minimumAge = null,
-            string requireAddress = null, string redirectUrl = null, TabVisibility visibility = null,
-            string expiration = null, List<BunqId> tabAttachment = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<string> Create(int cashRegisterId, string description, string status, Amount amountTotal, int? monetaryAccountId= null, string merchantReference = null, bool? allowAmountHigher = null, bool? allowAmountLower = null, bool? wantTip = null, int? minimumAge = null, string requireAddress = null, string redirectUrl = null, TabVisibility visibility = null, string expiration = null, List<BunqId> tabAttachment = 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_MERCHANT_REFERENCE, merchantReference},
-                {FIELD_DESCRIPTION, description},
-                {FIELD_STATUS, status},
-                {FIELD_AMOUNT_TOTAL, amountTotal},
-                {FIELD_ALLOW_AMOUNT_HIGHER, allowAmountHigher},
-                {FIELD_ALLOW_AMOUNT_LOWER, allowAmountLower},
-                {FIELD_WANT_TIP, wantTip},
-                {FIELD_MINIMUM_AGE, minimumAge},
-                {FIELD_REQUIRE_ADDRESS, requireAddress},
-                {FIELD_REDIRECT_URL, redirectUrl},
-                {FIELD_VISIBILITY, visibility},
-                {FIELD_EXPIRATION, expiration},
-                {FIELD_TAB_ATTACHMENT, tabAttachment},
-            };
-
+    {
+    {FIELD_MERCHANT_REFERENCE, merchantReference},
+    {FIELD_DESCRIPTION, description},
+    {FIELD_STATUS, status},
+    {FIELD_AMOUNT_TOTAL, amountTotal},
+    {FIELD_ALLOW_AMOUNT_HIGHER, allowAmountHigher},
+    {FIELD_ALLOW_AMOUNT_LOWER, allowAmountLower},
+    {FIELD_WANT_TIP, wantTip},
+    {FIELD_MINIMUM_AGE, minimumAge},
+    {FIELD_REQUIRE_ADDRESS, requireAddress},
+    {FIELD_REDIRECT_URL, redirectUrl},
+    {FIELD_VISIBILITY, visibility},
+    {FIELD_EXPIRATION, expiration},
+    {FIELD_TAB_ATTACHMENT, tabAttachment},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Post(
-                    string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), requestBytes, customHeaders);
+    
             return ProcessForUuid(responseRaw);
         }
-
+    
         /// <summary>
         /// Modify a specific TabUsageSingle. You can change the amount_total, status and visibility. Once you change
         /// the status to WAITING_FOR_PAYMENT the TabUsageSingle will expire after 5 minutes (default) or up to 1 hour
@@ -254,86 +244,68 @@ public static BunqResponse<string> Create(int cashRegisterId, string description
         /// <param name="visibility">The visibility of a Tab. A Tab can be visible trough NearPay, the QR code of the CashRegister and its own QR code.</param>
         /// <param name="expiration">The moment when this Tab expires. Can be at most 1 hour into the future.</param>
         /// <param name="tabAttachment">An array of attachments that describe the tab. Uploaded through the POST /user/{userid}/attachment-tab endpoint.</param>
-        public static BunqResponse<string> Update(int cashRegisterId, string tabUsageSingleUuid,
-            int? monetaryAccountId = null, string status = null, Amount amountTotal = null,
-            TabVisibility visibility = null, string expiration = null, List<BunqId> tabAttachment = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<string> Update(int cashRegisterId, string tabUsageSingleUuid, int? monetaryAccountId= null, string status = null, Amount amountTotal = null, TabVisibility visibility = null, string expiration = null, List<BunqId> tabAttachment = 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},
-                {FIELD_AMOUNT_TOTAL, amountTotal},
-                {FIELD_VISIBILITY, visibility},
-                {FIELD_EXPIRATION, expiration},
-                {FIELD_TAB_ATTACHMENT, tabAttachment},
-            };
-
+    {
+    {FIELD_STATUS, status},
+    {FIELD_AMOUNT_TOTAL, amountTotal},
+    {FIELD_VISIBILITY, visibility},
+    {FIELD_EXPIRATION, expiration},
+    {FIELD_TAB_ATTACHMENT, tabAttachment},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw =
-                apiClient.Put(
-                    string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId),
-                        cashRegisterId, tabUsageSingleUuid), requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUsageSingleUuid), requestBytes, customHeaders);
+    
             return ProcessForUuid(responseRaw);
         }
-
+    
         /// <summary>
         /// Cancel a specific TabUsageSingle.
         /// </summary>
-        public static BunqResponse<object> Delete(int cashRegisterId, string tabUsageSingleUuid,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int cashRegisterId, string tabUsageSingleUuid, int? 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),
-                        cashRegisterId, tabUsageSingleUuid), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUsageSingleUuid), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
         /// Get a specific TabUsageSingle.
         /// </summary>
-        public static BunqResponse<TabUsageSingle> Get(int cashRegisterId, string tabUsageSingleUuid,
-            int? monetaryAccountId = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TabUsageSingle> Get(int cashRegisterId, string tabUsageSingleUuid, int? 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),
-                        cashRegisterId, tabUsageSingleUuid), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId, tabUsageSingleUuid), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TabUsageSingle>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Get a collection of TabUsageSingle.
         /// </summary>
-        public static BunqResponse<List<TabUsageSingle>> List(int cashRegisterId, int? monetaryAccountId = null,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TabUsageSingle>> List(int cashRegisterId, int? 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), cashRegisterId), urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), DetermineMonetaryAccountId(monetaryAccountId), cashRegisterId), urlParams, customHeaders);
+    
             return FromJsonList<TabUsageSingle>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -342,105 +314,105 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.MerchantReference != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.AmountTotal != null)
             {
                 return false;
             }
-
+    
             if (this.AmountPaid != null)
             {
                 return false;
             }
-
+    
             if (this.QrCodeToken != null)
             {
                 return false;
             }
-
+    
             if (this.TabUrl != null)
             {
                 return false;
             }
-
+    
             if (this.Visibility != null)
             {
                 return false;
             }
-
+    
             if (this.MinimumAge != null)
             {
                 return false;
             }
-
+    
             if (this.RequireAddress != null)
             {
                 return false;
             }
-
+    
             if (this.RedirectUrl != null)
             {
                 return false;
             }
-
+    
             if (this.Expiration != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CashRegisterLocation != null)
             {
                 return false;
             }
-
+    
             if (this.TabItem != null)
             {
                 return false;
             }
-
+    
             if (this.TabAttachment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabUsageSingle CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabUsageSingle>(json);
+            return BunqModel.CreateFromJsonString<TabUsageSingle>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TokenQrRequestIdeal.cs b/BunqSdk/Model/Generated/Endpoint/TokenQrRequestIdeal.cs
index f2eff8e..7f4a04a 100644
--- a/BunqSdk/Model/Generated/Endpoint/TokenQrRequestIdeal.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TokenQrRequestIdeal.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,170 +22,168 @@ public class TokenQrRequestIdeal : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/token-qr-request-ideal";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_TOKEN = "token";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "RequestResponse";
-
+    
         /// <summary>
         /// The token passed from a site or read from a QR code.
         /// </summary>
         [JsonProperty(PropertyName = "token")]
         public string Token { get; set; }
-
+    
         /// <summary>
         /// The id of the RequestResponse.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the RequestResponse was responded to.
         /// </summary>
         [JsonProperty(PropertyName = "time_responded")]
         public string TimeResponded { get; set; }
-
+    
         /// <summary>
         /// The timestamp of when the RequestResponse expired or will expire.
         /// </summary>
         [JsonProperty(PropertyName = "time_expiry")]
         public string TimeExpiry { get; set; }
-
+    
         /// <summary>
         /// The id of the MonetaryAccount the RequestResponse was received on.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public int? MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The requested Amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_inquired")]
         public Amount AmountInquired { get; set; }
-
+    
         /// <summary>
         /// The Amount the RequestResponse was accepted with.
         /// </summary>
         [JsonProperty(PropertyName = "amount_responded")]
         public Amount AmountResponded { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the MonetaryAccount this RequestResponse was
         /// received on.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount with the public information of the MonetaryAccount that is requesting money with
         /// this RequestResponse.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The description for the RequestResponse provided by the requesting party. Maximum 9000 characters.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The Attachments attached to the RequestResponse.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<Attachment> Attachment { get; set; }
-
+    
         /// <summary>
         /// The status of the created RequestResponse. Can only be PENDING.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The minimum age the user accepting the RequestResponse must have.
         /// </summary>
         [JsonProperty(PropertyName = "minimum_age")]
         public int? MinimumAge { get; set; }
-
+    
         /// <summary>
         /// Whether or not an address must be provided on accept.
         /// </summary>
         [JsonProperty(PropertyName = "require_address")]
         public string RequireAddress { get; set; }
-
+    
         /// <summary>
         /// The shipping address provided by the accepting user if an address was requested.
         /// </summary>
         [JsonProperty(PropertyName = "address_shipping")]
         public Address AddressShipping { get; set; }
-
+    
         /// <summary>
         /// The billing address provided by the accepting user if an address was requested.
         /// </summary>
         [JsonProperty(PropertyName = "address_billing")]
         public Address AddressBilling { get; set; }
-
+    
         /// <summary>
         /// The Geolocation where the RequestResponse was created.
         /// </summary>
         [JsonProperty(PropertyName = "geolocation")]
         public Geolocation Geolocation { get; set; }
-
+    
         /// <summary>
         /// The URL which the user is sent to after accepting or rejecting the Request.
         /// </summary>
         [JsonProperty(PropertyName = "redirect_url")]
         public string RedirectUrl { get; set; }
-
+    
         /// <summary>
         /// The type of the RequestResponse. Can be only be IDEAL.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The subtype of the RequestResponse. Can be only be NONE.
         /// </summary>
         [JsonProperty(PropertyName = "sub_type")]
         public string SubType { get; set; }
-
+    
         /// <summary>
         /// The whitelist id for this action or null.
         /// </summary>
         [JsonProperty(PropertyName = "eligible_whitelist_id")]
         public int? EligibleWhitelistId { get; set; }
-
-
+    
+    
         /// <summary>
         /// Create a request from an ideal transaction.
         /// </summary>
         /// <param name="token">The token passed from a site or read from a QR code.</param>
-        public static BunqResponse<TokenQrRequestIdeal> Create(string token,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TokenQrRequestIdeal> Create(string token, 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_TOKEN, token},
-            };
-
+    {
+    {FIELD_TOKEN, token},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return FromJson<TokenQrRequestIdeal>(responseRaw, OBJECT_TYPE_POST);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -192,110 +192,110 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TimeResponded != null)
             {
                 return false;
             }
-
+    
             if (this.TimeExpiry != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.AmountInquired != null)
             {
                 return false;
             }
-
+    
             if (this.AmountResponded != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.MinimumAge != null)
             {
                 return false;
             }
-
+    
             if (this.RequireAddress != null)
             {
                 return false;
             }
-
+    
             if (this.AddressShipping != null)
             {
                 return false;
             }
-
+    
             if (this.AddressBilling != null)
             {
                 return false;
             }
-
+    
             if (this.Geolocation != null)
             {
                 return false;
             }
-
+    
             if (this.RedirectUrl != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.SubType != null)
             {
                 return false;
             }
-
+    
             if (this.EligibleWhitelistId != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TokenQrRequestIdeal CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TokenQrRequestIdeal>(json);
+            return BunqModel.CreateFromJsonString<TokenQrRequestIdeal>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TokenQrRequestSofort.cs b/BunqSdk/Model/Generated/Endpoint/TokenQrRequestSofort.cs
index c54b107..3fca876 100644
--- a/BunqSdk/Model/Generated/Endpoint/TokenQrRequestSofort.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TokenQrRequestSofort.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,59 +18,57 @@ public class TokenQrRequestSofort : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/token-qr-request-sofort";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_TOKEN = "token";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_POST = "RequestResponse";
-
+    
         /// <summary>
         /// The token passed from a site or read from a QR code.
         /// </summary>
         [JsonProperty(PropertyName = "token")]
         public string Token { get; set; }
-
+    
         /// <summary>
         /// Create a request from an SOFORT transaction.
         /// </summary>
         /// <param name="token">The token passed from a site or read from a QR code.</param>
-        public static BunqResponse<TokenQrRequestSofort> Create(string token,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TokenQrRequestSofort> Create(string token, 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_TOKEN, token},
-            };
-
+    {
+    {FIELD_TOKEN, token},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return FromJson<TokenQrRequestSofort>(responseRaw, OBJECT_TYPE_POST);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TokenQrRequestSofort CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TokenQrRequestSofort>(json);
+            return BunqModel.CreateFromJsonString<TokenQrRequestSofort>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountQuote.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountQuote.cs
index 76054e6..0983446 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountQuote.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountQuote.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +22,7 @@ public class TransferwiseAccountQuote : BunqModel
         protected const string ENDPOINT_URL_READ = "user/{0}/transferwise-quote/{1}/transferwise-recipient/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/transferwise-quote/{1}/transferwise-recipient";
         protected const string ENDPOINT_URL_DELETE = "user/{0}/transferwise-quote/{1}/transferwise-recipient/{2}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -28,139 +30,126 @@ public class TransferwiseAccountQuote : BunqModel
         public const string FIELD_NAME_ACCOUNT_HOLDER = "name_account_holder";
         public const string FIELD_TYPE = "type";
         public const string FIELD_DETAIL = "detail";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TransferwiseRecipient";
-
+    
         /// <summary>
         /// The country of the account.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// The name of the account holder.
         /// </summary>
         [JsonProperty(PropertyName = "name_account_holder")]
         public string NameAccountHolder { get; set; }
-
+    
         /// <summary>
         /// The chosen recipient account type. The possible options are provided dynamically in the response endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The fields which were specified as "required" and have since been filled by the user. Always provide the
         /// full list.
         /// </summary>
         [JsonProperty(PropertyName = "detail")]
         public List<TransferwiseRequirementField> Detail { get; set; }
-
+    
         /// <summary>
         /// Transferwise's id of the account.
         /// </summary>
         [JsonProperty(PropertyName = "account_id")]
         public string AccountId { get; set; }
-
+    
         /// <summary>
         /// The currency the account.
         /// </summary>
         [JsonProperty(PropertyName = "currency")]
         public string Currency { get; set; }
-
+    
         /// <summary>
         /// The account number.
         /// </summary>
         [JsonProperty(PropertyName = "account_number")]
         public string AccountNumber { get; set; }
-
+    
         /// <summary>
         /// The bank code.
         /// </summary>
         [JsonProperty(PropertyName = "bank_code")]
         public string BankCode { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="nameAccountHolder">The name of the account holder.</param>
         /// <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<TransferwiseRequirementField> detail = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int transferwiseQuoteId, string nameAccountHolder, string type, string country = null, List<TransferwiseRequirementField> detail = 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_COUNTRY, country},
-                {FIELD_NAME_ACCOUNT_HOLDER, nameAccountHolder},
-                {FIELD_TYPE, type},
-                {FIELD_DETAIL, detail},
-            };
-
+    {
+    {FIELD_COUNTRY, country},
+    {FIELD_NAME_ACCOUNT_HOLDER, nameAccountHolder},
+    {FIELD_TYPE, type},
+    {FIELD_DETAIL, detail},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), transferwiseQuoteId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), transferwiseQuoteId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<TransferwiseAccountQuote> Get(int transferwiseQuoteId,
-            int transferwiseAccountQuoteId, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TransferwiseAccountQuote> Get(int transferwiseQuoteId, int transferwiseAccountQuoteId, 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(), transferwiseQuoteId,
-                        transferwiseAccountQuoteId), new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), transferwiseQuoteId, transferwiseAccountQuoteId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TransferwiseAccountQuote>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TransferwiseAccountQuote>> List(int transferwiseQuoteId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TransferwiseAccountQuote>> List(int 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), transferwiseQuoteId),
-                urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), transferwiseQuoteId), urlParams, customHeaders);
+    
             return FromJsonList<TransferwiseAccountQuote>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<object> Delete(int transferwiseQuoteId, int transferwiseAccountQuoteId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<object> Delete(int transferwiseQuoteId, int transferwiseAccountQuoteId, 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(), transferwiseQuoteId,
-                        transferwiseAccountQuoteId), customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), transferwiseQuoteId, transferwiseAccountQuoteId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -169,40 +158,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Currency != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             if (this.NameAccountHolder != null)
             {
                 return false;
             }
-
+    
             if (this.AccountNumber != null)
             {
                 return false;
             }
-
+    
             if (this.BankCode != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseAccountQuote CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseAccountQuote>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseAccountQuote>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountRequirement.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountRequirement.cs
index efc0aa9..3bf9f3d 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountRequirement.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseAccountRequirement.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,11 +18,9 @@ public class TransferwiseAccountRequirement : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/transferwise-quote/{1}/transferwise-recipient-requirement";
-        protected const string ENDPOINT_URL_LISTING =
-            "user/{0}/transferwise-quote/{1}/transferwise-recipient-requirement";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/transferwise-quote/{1}/transferwise-recipient-requirement";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/transferwise-quote/{1}/transferwise-recipient-requirement";
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -28,95 +28,90 @@ public class TransferwiseAccountRequirement : BunqModel
         public const string FIELD_NAME_ACCOUNT_HOLDER = "name_account_holder";
         public const string FIELD_TYPE = "type";
         public const string FIELD_DETAIL = "detail";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TransferwiseRequirement";
-
+    
         /// <summary>
         /// The country of the receiving account.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// The name of the account holder.
         /// </summary>
         [JsonProperty(PropertyName = "name_account_holder")]
         public string NameAccountHolder { get; set; }
-
+    
         /// <summary>
         /// A possible recipient account type.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The fields which were specified as "required" and have since been filled by the user. Always provide the
         /// full list.
         /// </summary>
         [JsonProperty(PropertyName = "detail")]
         public List<TransferwiseRequirementField> Detail { get; set; }
-
+    
         /// <summary>
         /// The label of the possible recipient account type to show to the user.
         /// </summary>
         [JsonProperty(PropertyName = "label")]
         public string Label { get; set; }
-
+    
         /// <summary>
         /// The fields which the user needs to fill.
         /// </summary>
         [JsonProperty(PropertyName = "fields")]
         public List<TransferwiseRequirementField> Fields { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="nameAccountHolder">The name of the account holder.</param>
         /// <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<TransferwiseRequirementField> detail = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int transferwiseQuoteId, string nameAccountHolder, string type, string country = null, List<TransferwiseRequirementField> detail = 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_COUNTRY, country},
-                {FIELD_NAME_ACCOUNT_HOLDER, nameAccountHolder},
-                {FIELD_TYPE, type},
-                {FIELD_DETAIL, detail},
-            };
-
+    {
+    {FIELD_COUNTRY, country},
+    {FIELD_NAME_ACCOUNT_HOLDER, nameAccountHolder},
+    {FIELD_TYPE, type},
+    {FIELD_DETAIL, detail},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), transferwiseQuoteId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), transferwiseQuoteId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TransferwiseAccountRequirement>> List(int transferwiseQuoteId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TransferwiseAccountRequirement>> List(int 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), transferwiseQuoteId),
-                urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), transferwiseQuoteId), urlParams, customHeaders);
+    
             return FromJsonList<TransferwiseAccountRequirement>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -125,25 +120,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Label != null)
             {
                 return false;
             }
-
+    
             if (this.Fields != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseAccountRequirement CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseAccountRequirement>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseAccountRequirement>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseCurrency.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseCurrency.cs
index aa07545..89b5792 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseCurrency.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseCurrency.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,47 +18,45 @@ public class TransferwiseCurrency : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/transferwise-currency";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TransferwiseCurrency";
-
+    
         /// <summary>
         /// The currency code.
         /// </summary>
         [JsonProperty(PropertyName = "currency")]
         public string Currency { get; set; }
-
+    
         /// <summary>
         /// The currency name.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
+    
         /// <summary>
         /// The country code associated with the currency.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TransferwiseCurrency>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TransferwiseCurrency>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<TransferwiseCurrency>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -63,25 +65,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Name != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseCurrency CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseCurrency>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseCurrency>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseQuote.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseQuote.cs
index 7e01718..14d3df5 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseQuote.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseQuote.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,7 +20,7 @@ public class TransferwiseQuote : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/transferwise-quote";
         protected const string ENDPOINT_URL_READ = "user/{0}/transferwise-quote/{1}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -26,128 +28,124 @@ public class TransferwiseQuote : BunqModel
         public const string FIELD_CURRENCY_TARGET = "currency_target";
         public const string FIELD_AMOUNT_SOURCE = "amount_source";
         public const string FIELD_AMOUNT_TARGET = "amount_target";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TransferwiseQuote";
-
+    
         /// <summary>
         /// The source currency.
         /// </summary>
         [JsonProperty(PropertyName = "currency_source")]
         public string CurrencySource { get; set; }
-
+    
         /// <summary>
         /// The target currency.
         /// </summary>
         [JsonProperty(PropertyName = "currency_target")]
         public string CurrencyTarget { get; set; }
-
+    
         /// <summary>
         /// The source amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_source")]
         public Amount AmountSource { get; set; }
-
+    
         /// <summary>
         /// The target amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_target")]
         public Amount AmountTarget { get; set; }
-
+    
         /// <summary>
         /// The id of the quote.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the quote's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the quote's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The expiration timestamp of the quote.
         /// </summary>
         [JsonProperty(PropertyName = "time_expiry")]
         public string TimeExpiry { get; set; }
-
+    
         /// <summary>
         /// The quote id Transferwise needs.
         /// </summary>
         [JsonProperty(PropertyName = "quote_id")]
         public string QuoteId { get; set; }
-
+    
         /// <summary>
         /// The fee amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_fee")]
         public Amount AmountFee { get; set; }
-
+    
         /// <summary>
         /// The rate.
         /// </summary>
         [JsonProperty(PropertyName = "rate")]
         public string Rate { get; set; }
-
+    
         /// <summary>
         /// The estimated delivery time.
         /// </summary>
         [JsonProperty(PropertyName = "time_delivery_estimate")]
         public string TimeDeliveryEstimate { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="currencySource">The source currency.</param>
         /// <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, Amount amountSource = null,
-            Amount amountTarget = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(string currencySource, string currencyTarget, Amount amountSource = null, Amount amountTarget = 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_CURRENCY_SOURCE, currencySource},
-                {FIELD_CURRENCY_TARGET, currencyTarget},
-                {FIELD_AMOUNT_SOURCE, amountSource},
-                {FIELD_AMOUNT_TARGET, amountTarget},
-            };
-
+    {
+    {FIELD_CURRENCY_SOURCE, currencySource},
+    {FIELD_CURRENCY_TARGET, currencyTarget},
+    {FIELD_AMOUNT_SOURCE, amountSource},
+    {FIELD_AMOUNT_TARGET, amountTarget},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<TransferwiseQuote> Get(int transferwiseQuoteId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TransferwiseQuote> Get(int transferwiseQuoteId, 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(), transferwiseQuoteId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), transferwiseQuoteId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TransferwiseQuote>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -156,60 +154,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.TimeExpiry != null)
             {
                 return false;
             }
-
+    
             if (this.QuoteId != null)
             {
                 return false;
             }
-
+    
             if (this.AmountSource != null)
             {
                 return false;
             }
-
+    
             if (this.AmountTarget != null)
             {
                 return false;
             }
-
+    
             if (this.AmountFee != null)
             {
                 return false;
             }
-
+    
             if (this.Rate != null)
             {
                 return false;
             }
-
+    
             if (this.TimeDeliveryEstimate != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseQuote CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseQuote>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseQuote>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteTemporary.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteTemporary.cs
index 37fce76..a217c53 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteTemporary.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseQuoteTemporary.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -18,7 +20,7 @@ public class TransferwiseQuoteTemporary : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/transferwise-quote-temporary";
         protected const string ENDPOINT_URL_READ = "user/{0}/transferwise-quote-temporary/{1}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -26,117 +28,112 @@ public class TransferwiseQuoteTemporary : BunqModel
         public const string FIELD_CURRENCY_TARGET = "currency_target";
         public const string FIELD_AMOUNT_SOURCE = "amount_source";
         public const string FIELD_AMOUNT_TARGET = "amount_target";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TransferwiseQuote";
-
+    
         /// <summary>
         /// The source currency.
         /// </summary>
         [JsonProperty(PropertyName = "currency_source")]
         public string CurrencySource { get; set; }
-
+    
         /// <summary>
         /// The target currency.
         /// </summary>
         [JsonProperty(PropertyName = "currency_target")]
         public string CurrencyTarget { get; set; }
-
+    
         /// <summary>
         /// The source amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_source")]
         public Amount AmountSource { get; set; }
-
+    
         /// <summary>
         /// The target amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_target")]
         public Amount AmountTarget { get; set; }
-
+    
         /// <summary>
         /// The id of the quote.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 expiration timestamp of the quote. Will always be null for temporary quotes.
         /// </summary>
         [JsonProperty(PropertyName = "time_expiry")]
         public string TimeExpiry { get; set; }
-
+    
         /// <summary>
         /// The quote id Transferwise needs. Will always be null for temporary quotes.
         /// </summary>
         [JsonProperty(PropertyName = "quote_id")]
         public string QuoteId { get; set; }
-
+    
         /// <summary>
         /// The rate.
         /// </summary>
         [JsonProperty(PropertyName = "rate")]
         public string Rate { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         /// <param name="currencySource">The source currency.</param>
         /// <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, Amount amountSource = null,
-            Amount amountTarget = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(string currencySource, string currencyTarget, Amount amountSource = null, Amount amountTarget = 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_CURRENCY_SOURCE, currencySource},
-                {FIELD_CURRENCY_TARGET, currencyTarget},
-                {FIELD_AMOUNT_SOURCE, amountSource},
-                {FIELD_AMOUNT_TARGET, amountTarget},
-            };
-
+    {
+    {FIELD_CURRENCY_SOURCE, currencySource},
+    {FIELD_CURRENCY_TARGET, currencyTarget},
+    {FIELD_AMOUNT_SOURCE, amountSource},
+    {FIELD_AMOUNT_TARGET, amountTarget},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<TransferwiseQuoteTemporary> Get(int transferwiseQuoteTemporaryId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TransferwiseQuoteTemporary> Get(int transferwiseQuoteTemporaryId, 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(), transferwiseQuoteTemporaryId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), transferwiseQuoteTemporaryId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TransferwiseQuoteTemporary>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -145,50 +142,50 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.TimeExpiry != null)
             {
                 return false;
             }
-
+    
             if (this.QuoteId != null)
             {
                 return false;
             }
-
+    
             if (this.AmountSource != null)
             {
                 return false;
             }
-
+    
             if (this.AmountTarget != null)
             {
                 return false;
             }
-
+    
             if (this.Rate != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseQuoteTemporary CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseQuoteTemporary>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseQuoteTemporary>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseTransfer.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseTransfer.cs
index c31d96a..8acfa3b 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseTransfer.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseTransfer.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -19,165 +21,157 @@ public class TransferwiseTransfer : BunqModel
         protected const string ENDPOINT_URL_CREATE = "user/{0}/transferwise-quote/{1}/transferwise-transfer";
         protected const string ENDPOINT_URL_READ = "user/{0}/transferwise-quote/{1}/transferwise-transfer/{2}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/transferwise-quote/{1}/transferwise-transfer";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_MONETARY_ACCOUNT_ID = "monetary_account_id";
         public const string FIELD_RECIPIENT_ID = "recipient_id";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TransferwisePayment";
-
+    
         /// <summary>
         /// The id of the monetary account the payment should be made from.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id")]
         public string MonetaryAccountId { get; set; }
-
+    
         /// <summary>
         /// The id of the target account.
         /// </summary>
         [JsonProperty(PropertyName = "recipient_id")]
         public string RecipientId { 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 status.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The subStatus.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The status as Transferwise reports it.
         /// </summary>
         [JsonProperty(PropertyName = "status_transferwise")]
         public string StatusTransferwise { get; set; }
-
+    
         /// <summary>
         /// A status to indicatie if Transferwise has an issue with this payment and requires more information.
         /// </summary>
         [JsonProperty(PropertyName = "status_transferwise_issue")]
         public string StatusTransferwiseIssue { get; set; }
-
+    
         /// <summary>
         /// The source amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_source")]
         public Amount AmountSource { get; set; }
-
+    
         /// <summary>
         /// The target amount.
         /// </summary>
         [JsonProperty(PropertyName = "amount_target")]
         public Amount AmountTarget { get; set; }
-
+    
         /// <summary>
         /// The rate of the payment.
         /// </summary>
         [JsonProperty(PropertyName = "rate")]
         public string Rate { get; set; }
-
+    
         /// <summary>
         /// The reference of the payment.
         /// </summary>
         [JsonProperty(PropertyName = "reference")]
         public string Reference { get; set; }
-
+    
         /// <summary>
         /// The Pay-In reference of the payment.
         /// </summary>
         [JsonProperty(PropertyName = "pay_in_reference")]
         public string PayInReference { get; set; }
-
+    
         /// <summary>
         /// The estimated delivery time.
         /// </summary>
         [JsonProperty(PropertyName = "time_delivery_estimate")]
         public string TimeDeliveryEstimate { get; set; }
-
+    
         /// <summary>
         /// The quote details used to created the payment.
         /// </summary>
         [JsonProperty(PropertyName = "quote")]
         public TransferwiseQuote Quote { get; set; }
-
-
+    
+    
         /// <summary>
         /// </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<int> Create(int transferwiseQuoteId, string monetaryAccountId, string recipientId, 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_MONETARY_ACCOUNT_ID, monetaryAccountId},
-                {FIELD_RECIPIENT_ID, recipientId},
-            };
-
+    {
+    {FIELD_MONETARY_ACCOUNT_ID, monetaryAccountId},
+    {FIELD_RECIPIENT_ID, recipientId},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), transferwiseQuoteId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), transferwiseQuoteId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<TransferwiseTransfer> Get(int transferwiseQuoteId, int transferwiseTransferId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<TransferwiseTransfer> Get(int transferwiseQuoteId, int transferwiseTransferId, 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(), transferwiseQuoteId, transferwiseTransferId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), transferwiseQuoteId, transferwiseTransferId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<TransferwiseTransfer>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TransferwiseTransfer>> List(int transferwiseQuoteId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TransferwiseTransfer>> List(int 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), transferwiseQuoteId),
-                urlParams, customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId(), transferwiseQuoteId), urlParams, customHeaders);
+    
             return FromJsonList<TransferwiseTransfer>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -186,75 +180,75 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.StatusTransferwise != null)
             {
                 return false;
             }
-
+    
             if (this.StatusTransferwiseIssue != null)
             {
                 return false;
             }
-
+    
             if (this.AmountSource != null)
             {
                 return false;
             }
-
+    
             if (this.AmountTarget != null)
             {
                 return false;
             }
-
+    
             if (this.Rate != null)
             {
                 return false;
             }
-
+    
             if (this.Reference != null)
             {
                 return false;
             }
-
+    
             if (this.PayInReference != null)
             {
                 return false;
             }
-
+    
             if (this.TimeDeliveryEstimate != null)
             {
                 return false;
             }
-
+    
             if (this.Quote != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseTransfer CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseTransfer>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseTransfer>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferRequirement.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferRequirement.cs
index 23211c9..e86fea5 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferRequirement.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseTransferRequirement.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -16,73 +18,70 @@ public class TransferwiseTransferRequirement : BunqModel
         /// <summary>
         /// Endpoint constants.
         /// </summary>
-        protected const string ENDPOINT_URL_CREATE =
-            "user/{0}/transferwise-quote/{1}/transferwise-transfer-requirement";
-
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/transferwise-quote/{1}/transferwise-transfer-requirement";
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_RECIPIENT_ID = "recipient_id";
         public const string FIELD_DETAIL = "detail";
-
-
+    
+    
         /// <summary>
         /// The id of the target account.
         /// </summary>
         [JsonProperty(PropertyName = "recipient_id")]
         public string RecipientId { get; set; }
-
+    
         /// <summary>
         /// The fields which were specified as "required" and have since been filled by the user. Always provide the
         /// full list.
         /// </summary>
         [JsonProperty(PropertyName = "detail")]
         public List<TransferwiseRequirementField> Detail { get; set; }
-
+    
         /// <summary>
         /// A possible transfer type.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The label of the possible transfer type to show to the user.
         /// </summary>
         [JsonProperty(PropertyName = "label")]
         public string Label { get; set; }
-
+    
         /// <summary>
         /// The fields which the user needs to fill.
         /// </summary>
         [JsonProperty(PropertyName = "fields")]
         public List<TransferwiseRequirementField> Fields { get; set; }
-
-
+    
+    
         /// <summary>
         /// </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<TransferwiseRequirementField> detail = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int transferwiseQuoteId, string recipientId, List<TransferwiseRequirementField> detail = 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_RECIPIENT_ID, recipientId},
-                {FIELD_DETAIL, detail},
-            };
-
+    {
+    {FIELD_RECIPIENT_ID, recipientId},
+    {FIELD_DETAIL, detail},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), transferwiseQuoteId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId(), transferwiseQuoteId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -91,25 +90,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Label != null)
             {
                 return false;
             }
-
+    
             if (this.Fields != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseTransferRequirement CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseTransferRequirement>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseTransferRequirement>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TransferwiseUser.cs b/BunqSdk/Model/Generated/Endpoint/TransferwiseUser.cs
index 0a6e437..98e8b58 100644
--- a/BunqSdk/Model/Generated/Endpoint/TransferwiseUser.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TransferwiseUser.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -17,93 +19,89 @@ public class TransferwiseUser : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_CREATE = "user/{0}/transferwise-user";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/transferwise-user";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_OAUTH_CODE = "oauth_code";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TransferwiseUser";
-
+    
         /// <summary>
         /// The OAuth code returned by Transferwise we should be using to gain access to the user's Transferwise
         /// account.
         /// </summary>
         [JsonProperty(PropertyName = "oauth_code")]
         public string OauthCode { get; set; }
-
+    
         /// <summary>
         /// The id of the TransferwiseUser.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the TransferwiseUser's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the TransferwiseUser's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The name the user is registered with at TransferWise.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
+    
         /// <summary>
         /// The email the user is registered with at TransferWise.
         /// </summary>
         [JsonProperty(PropertyName = "email")]
         public string Email { get; set; }
-
-
+    
+    
         /// <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<int> Create(string oauthCode = 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_OAUTH_CODE, oauthCode},
-            };
-
+    {
+    {FIELD_OAUTH_CODE, oauthCode},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TransferwiseUser>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TransferwiseUser>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<TransferwiseUser>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -112,35 +110,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Name != null)
             {
                 return false;
             }
-
+    
             if (this.Email != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseUser>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/TreeProgress.cs b/BunqSdk/Model/Generated/Endpoint/TreeProgress.cs
index 60eb07d..eec0286 100644
--- a/BunqSdk/Model/Generated/Endpoint/TreeProgress.cs
+++ b/BunqSdk/Model/Generated/Endpoint/TreeProgress.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,47 +19,45 @@ public class TreeProgress : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/tree-progress";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "TreeProgress";
-
+    
         /// <summary>
         /// The number of trees this user and all users have planted.
         /// </summary>
         [JsonProperty(PropertyName = "number_of_tree")]
         public double? NumberOfTree { get; set; }
-
+    
         /// <summary>
         /// The progress towards the next tree.
         /// </summary>
         [JsonProperty(PropertyName = "progress_tree_next")]
         public double? ProgressTreeNext { get; set; }
-
+    
         /// <summary>
         /// The label of the user the progress belongs to.
         /// </summary>
         [JsonProperty(PropertyName = "label_user")]
         public LabelUser LabelUser { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<TreeProgress>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<TreeProgress>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<TreeProgress>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -64,25 +66,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ProgressTreeNext != null)
             {
                 return false;
             }
-
+    
             if (this.LabelUser != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TreeProgress CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TreeProgress>(json);
+            return BunqModel.CreateFromJsonString<TreeProgress>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/User.cs b/BunqSdk/Model/Generated/Endpoint/User.cs
index a595413..8594a4a 100644
--- a/BunqSdk/Model/Generated/Endpoint/User.cs
+++ b/BunqSdk/Model/Generated/Endpoint/User.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -16,143 +20,126 @@ public class User : BunqModel, IAnchorObjectInterface
         /// 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_READ = "user/{0}";
         protected const string ENDPOINT_URL_LISTING = "user";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "User";
-
-        /// <summary>
-        /// </summary>
-        [JsonProperty(PropertyName = "UserLight")]
-        public UserLight UserLight { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "UserPerson")]
         public UserPerson UserPerson { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "UserCompany")]
         public UserCompany UserCompany { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "UserApiKey")]
         public UserApiKey UserApiKey { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "UserPaymentServiceProvider")]
         public UserPaymentServiceProvider UserPaymentServiceProvider { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get a specific user.
         /// </summary>
-        public static BunqResponse<User> Get(IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<User> Get( 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()),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId()), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<User>(responseRaw);
         }
-
+    
         /// <summary>
         /// Get a collection of all available users.
         /// </summary>
-        public static BunqResponse<List<User>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<User>> List( 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(ENDPOINT_URL_LISTING, urlParams, customHeaders);
-
+    
             return FromJsonList<User>(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
         {
-            if (this.UserLight != null)
-            {
-                return this.UserLight;
-            }
-
             if (this.UserPerson != null)
             {
                 return this.UserPerson;
             }
-
+    
             if (this.UserCompany != null)
             {
                 return this.UserCompany;
             }
-
+    
             if (this.UserApiKey != null)
             {
                 return this.UserApiKey;
             }
-
+    
             if (this.UserPaymentServiceProvider != null)
             {
                 return this.UserPaymentServiceProvider;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
-            if (this.UserLight != null)
-            {
-                return false;
-            }
-
             if (this.UserPerson != null)
             {
                 return false;
             }
-
+    
             if (this.UserCompany != null)
             {
                 return false;
             }
-
+    
             if (this.UserApiKey != null)
             {
                 return false;
             }
-
+    
             if (this.UserPaymentServiceProvider != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static User CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<User>(json);
+            return BunqModel.CreateFromJsonString<User>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/UserApiKey.cs b/BunqSdk/Model/Generated/Endpoint/UserApiKey.cs
index 6c85557..81e9854 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserApiKey.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserApiKey.cs
@@ -1,6 +1,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -14,32 +15,33 @@ public class UserApiKey : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the user object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the user object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The user who requested access.
         /// </summary>
         [JsonProperty(PropertyName = "requested_by_user")]
         public UserApiKeyAnchoredUser RequestedByUser { get; set; }
-
+    
         /// <summary>
         /// The user who granted access.
         /// </summary>
         [JsonProperty(PropertyName = "granted_by_user")]
         public UserApiKeyAnchoredUser GrantedByUser { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -48,35 +50,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.RequestedByUser != null)
             {
                 return false;
             }
-
+    
             if (this.GrantedByUser != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static UserApiKey CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<UserApiKey>(json);
+            return BunqModel.CreateFromJsonString<UserApiKey>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/UserCompany.cs b/BunqSdk/Model/Generated/Endpoint/UserCompany.cs
index c2bcd8e..047d94b 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserCompany.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserCompany.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +22,7 @@ public class UserCompany : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user-company/{0}";
         protected const string ENDPOINT_URL_UPDATE = "user-company/{0}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -39,234 +41,227 @@ public class UserCompany : BunqModel
         public const string FIELD_SUB_STATUS = "sub_status";
         public const string FIELD_SESSION_TIMEOUT = "session_timeout";
         public const string FIELD_DAILY_LIMIT_WITHOUT_CONFIRMATION_LOGIN = "daily_limit_without_confirmation_login";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "UserCompany";
-
+    
         /// <summary>
         /// The company name.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
+    
         /// <summary>
         /// The company's public nick name.
         /// </summary>
         [JsonProperty(PropertyName = "public_nick_name")]
         public string PublicNickName { get; set; }
-
+    
         /// <summary>
         /// The public UUID of the company's avatar.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_uuid")]
         public string AvatarUuid { get; set; }
-
+    
         /// <summary>
         /// The company's main address.
         /// </summary>
         [JsonProperty(PropertyName = "address_main")]
         public Address AddressMain { get; set; }
-
+    
         /// <summary>
         /// The company's postal address.
         /// </summary>
         [JsonProperty(PropertyName = "address_postal")]
         public Address AddressPostal { get; set; }
-
+    
         /// <summary>
         /// The person's preferred language. Formatted as a ISO 639-1 language code plus a ISO 3166-1 alpha-2 country
         /// code, seperated by an underscore.
         /// </summary>
         [JsonProperty(PropertyName = "language")]
         public string Language { get; set; }
-
+    
         /// <summary>
         /// The person's preferred region. Formatted as a ISO 639-1 language code plus a ISO 3166-1 alpha-2 country
         /// code, seperated by an underscore.
         /// </summary>
         [JsonProperty(PropertyName = "region")]
         public string Region { get; set; }
-
+    
         /// <summary>
         /// The country as an ISO 3166-1 alpha-2 country code.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// The names of the company's ultimate beneficiary owners. Minimum zero, maximum four.
         /// </summary>
         [JsonProperty(PropertyName = "ubo")]
         public List<Ubo> Ubo { get; set; }
-
+    
         /// <summary>
         /// The company's chamber of commerce number.
         /// </summary>
         [JsonProperty(PropertyName = "chamber_of_commerce_number")]
         public string ChamberOfCommerceNumber { get; set; }
-
+    
         /// <summary>
         /// The company's legal form.
         /// </summary>
         [JsonProperty(PropertyName = "legal_form")]
         public string LegalForm { get; set; }
-
+    
         /// <summary>
         /// The user status. Can be: ACTIVE, SIGNUP, RECOVERY.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The user sub-status. Can be: NONE, FACE_RESET, APPROVAL, APPROVAL_DIRECTOR, APPROVAL_PARENT,
         /// APPROVAL_SUPPORT, COUNTER_IBAN, IDEAL or SUBMIT.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The setting for the session timeout of the company in seconds.
         /// </summary>
         [JsonProperty(PropertyName = "session_timeout")]
         public int? SessionTimeout { get; set; }
-
+    
         /// <summary>
         /// The amount the company can pay in the session without asking for credentials.
         /// </summary>
         [JsonProperty(PropertyName = "daily_limit_without_confirmation_login")]
         public Amount DailyLimitWithoutConfirmationLogin { get; set; }
-
+    
         /// <summary>
         /// The id of the modified company.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the company object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the company object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The company's public UUID.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The company's display name.
         /// </summary>
         [JsonProperty(PropertyName = "display_name")]
         public string DisplayName { get; set; }
-
+    
         /// <summary>
         /// The aliases of the account.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public List<Pointer> Alias { get; set; }
-
+    
         /// <summary>
         /// The type of business entity.
         /// </summary>
         [JsonProperty(PropertyName = "type_of_business_entity")]
         public string TypeOfBusinessEntity { get; set; }
-
+    
         /// <summary>
         /// The sector of industry.
         /// </summary>
         [JsonProperty(PropertyName = "sector_of_industry")]
         public string SectorOfIndustry { get; set; }
-
+    
         /// <summary>
         /// The company's other bank account IBAN, through which we verify it.
         /// </summary>
         [JsonProperty(PropertyName = "counter_bank_iban")]
         public string CounterBankIban { get; set; }
-
+    
         /// <summary>
         /// The company's avatar.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The version of the terms of service accepted by the user.
         /// </summary>
         [JsonProperty(PropertyName = "version_terms_of_service")]
         public string VersionTermsOfService { get; set; }
-
-        /// <summary>
-        /// The existing bunq alias for the company's primary director.
-        /// </summary>
-        [JsonProperty(PropertyName = "director_alias")]
-        public LabelUser DirectorAlias { get; set; }
-
+    
         /// <summary>
         /// The existing bunq aliases for the company's directors.
         /// </summary>
         [JsonProperty(PropertyName = "directors")]
         public List<LabelUser> Directors { get; set; }
-
+    
         /// <summary>
         /// The types of notifications that will result in a push notification or URL callback for this UserCompany.
         /// </summary>
         [JsonProperty(PropertyName = "notification_filters")]
         public List<NotificationFilter> NotificationFilters { get; set; }
-
+    
         /// <summary>
         /// The customer profile of the company.
         /// </summary>
         [JsonProperty(PropertyName = "customer")]
         public Customer Customer { get; set; }
-
+    
         /// <summary>
         /// The customer limits of the company.
         /// </summary>
         [JsonProperty(PropertyName = "customer_limit")]
         public CustomerLimit CustomerLimit { get; set; }
-
+    
         /// <summary>
         /// The subscription of the company.
         /// </summary>
         [JsonProperty(PropertyName = "billing_contract")]
         public List<BillingContractSubscription> BillingContract { get; set; }
-
+    
         /// <summary>
         /// The user deny reason.
         /// </summary>
         [JsonProperty(PropertyName = "deny_reason")]
         public string DenyReason { get; set; }
-
+    
         /// <summary>
         /// The relations for this user.
         /// </summary>
         [JsonProperty(PropertyName = "relations")]
         public List<RelationUser> Relations { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get a specific company.
         /// </summary>
-        public static BunqResponse<UserCompany> Get(IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<UserCompany> Get( 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()),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId()), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<UserCompany>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Modify a specific company's data.
         /// </summary>
@@ -285,43 +280,38 @@ public static BunqResponse<UserCompany> Get(IDictionary<string, string> customHe
         /// <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, Address addressMain = null, Address addressPostal = null, string language = null,
-            string region = null, string country = null, List<Ubo> ubo = null, string chamberOfCommerceNumber = null,
-            string legalForm = null, string status = null, string subStatus = null, int? sessionTimeout = null,
-            Amount dailyLimitWithoutConfirmationLogin = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(string name = null, string publicNickName = null, string avatarUuid = null, Address addressMain = null, Address addressPostal = null, string language = null, string region = null, string country = null, List<Ubo> ubo = null, string chamberOfCommerceNumber = null, string legalForm = null, string status = null, string subStatus = null, int? sessionTimeout = null, Amount dailyLimitWithoutConfirmationLogin = 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_NAME, name},
-                {FIELD_PUBLIC_NICK_NAME, publicNickName},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_ADDRESS_MAIN, addressMain},
-                {FIELD_ADDRESS_POSTAL, addressPostal},
-                {FIELD_LANGUAGE, language},
-                {FIELD_REGION, region},
-                {FIELD_COUNTRY, country},
-                {FIELD_UBO, ubo},
-                {FIELD_CHAMBER_OF_COMMERCE_NUMBER, chamberOfCommerceNumber},
-                {FIELD_LEGAL_FORM, legalForm},
-                {FIELD_STATUS, status},
-                {FIELD_SUB_STATUS, subStatus},
-                {FIELD_SESSION_TIMEOUT, sessionTimeout},
-                {FIELD_DAILY_LIMIT_WITHOUT_CONFIRMATION_LOGIN, dailyLimitWithoutConfirmationLogin},
-            };
-
+    {
+    {FIELD_NAME, name},
+    {FIELD_PUBLIC_NICK_NAME, publicNickName},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_ADDRESS_MAIN, addressMain},
+    {FIELD_ADDRESS_POSTAL, addressPostal},
+    {FIELD_LANGUAGE, language},
+    {FIELD_REGION, region},
+    {FIELD_COUNTRY, country},
+    {FIELD_UBO, ubo},
+    {FIELD_CHAMBER_OF_COMMERCE_NUMBER, chamberOfCommerceNumber},
+    {FIELD_LEGAL_FORM, legalForm},
+    {FIELD_STATUS, status},
+    {FIELD_SUB_STATUS, subStatus},
+    {FIELD_SESSION_TIMEOUT, sessionTimeout},
+    {FIELD_DAILY_LIMIT_WITHOUT_CONFIRMATION_LOGIN, dailyLimitWithoutConfirmationLogin},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -330,175 +320,170 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Name != null)
             {
                 return false;
             }
-
+    
             if (this.DisplayName != null)
             {
                 return false;
             }
-
+    
             if (this.PublicNickName != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.ChamberOfCommerceNumber != null)
             {
                 return false;
             }
-
+    
             if (this.LegalForm != null)
             {
                 return false;
             }
-
+    
             if (this.TypeOfBusinessEntity != null)
             {
                 return false;
             }
-
+    
             if (this.SectorOfIndustry != null)
             {
                 return false;
             }
-
+    
             if (this.CounterBankIban != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.AddressMain != null)
             {
                 return false;
             }
-
+    
             if (this.AddressPostal != null)
             {
                 return false;
             }
-
+    
             if (this.VersionTermsOfService != null)
             {
                 return false;
             }
-
-            if (this.DirectorAlias != null)
-            {
-                return false;
-            }
-
+    
             if (this.Directors != null)
             {
                 return false;
             }
-
+    
             if (this.Language != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             if (this.Region != null)
             {
                 return false;
             }
-
+    
             if (this.Ubo != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.SessionTimeout != null)
             {
                 return false;
             }
-
+    
             if (this.DailyLimitWithoutConfirmationLogin != null)
             {
                 return false;
             }
-
+    
             if (this.NotificationFilters != null)
             {
                 return false;
             }
-
+    
             if (this.Customer != null)
             {
                 return false;
             }
-
+    
             if (this.CustomerLimit != null)
             {
                 return false;
             }
-
+    
             if (this.BillingContract != null)
             {
                 return false;
             }
-
+    
             if (this.DenyReason != null)
             {
                 return false;
             }
-
+    
             if (this.Relations != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static UserCompany CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<UserCompany>(json);
+            return BunqModel.CreateFromJsonString<UserCompany>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/UserCompanyName.cs b/BunqSdk/Model/Generated/Endpoint/UserCompanyName.cs
index 60cc550..bb01bb9 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserCompanyName.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserCompanyName.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -15,35 +19,33 @@ public class UserCompanyName : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user-company/{0}/name";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "UserCompanyNameArray";
-
+    
         /// <summary>
         /// All known (trade) names for a user company.
         /// </summary>
         [JsonProperty(PropertyName = "name_array")]
         public List<string> NameArray { get; set; }
-
+    
         /// <summary>
         /// Return all the known (trade) names for a specific user company.
         /// </summary>
-        public static BunqResponse<List<UserCompanyName>> List(int userCompanyId,
-            IDictionary<string, string> urlParams = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<UserCompanyName>> List(int 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>();
-
+    
             var apiClient = new ApiClient(GetApiContext());
-            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<UserCompanyName>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -52,15 +54,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static UserCompanyName CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<UserCompanyName>(json);
+            return BunqModel.CreateFromJsonString<UserCompanyName>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/UserCredentialPasswordIp.cs b/BunqSdk/Model/Generated/Endpoint/UserCredentialPasswordIp.cs
index 9ef004d..83cec93 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserCredentialPasswordIp.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserCredentialPasswordIp.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -17,86 +21,81 @@ public class UserCredentialPasswordIp : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user/{0}/credential-password-ip/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/credential-password-ip";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "CredentialPasswordIp";
-
+    
         /// <summary>
         /// The id of the credential.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the credential object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the credential object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The status of the credential.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// When the status is PENDING_FIRST_USE: when the credential expires.
         /// </summary>
         [JsonProperty(PropertyName = "expiry_time")]
         public string ExpiryTime { get; set; }
-
+    
         /// <summary>
         /// When the status is PENDING_FIRST_USE: the value of the token.
         /// </summary>
         [JsonProperty(PropertyName = "token_value")]
         public string TokenValue { get; set; }
-
+    
         /// <summary>
         /// When the status is ACTIVE: the details of the device that may use the credential.
         /// </summary>
         [JsonProperty(PropertyName = "permitted_device")]
         public PermittedDevice PermittedDevice { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<UserCredentialPasswordIp> Get(int userCredentialPasswordIpId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<UserCredentialPasswordIp> Get(int userCredentialPasswordIpId, 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(), userCredentialPasswordIpId),
-                    new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), userCredentialPasswordIpId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<UserCredentialPasswordIp>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<UserCredentialPasswordIp>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<UserCredentialPasswordIp>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<UserCredentialPasswordIp>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -105,45 +104,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.ExpiryTime != null)
             {
                 return false;
             }
-
+    
             if (this.TokenValue != null)
             {
                 return false;
             }
-
+    
             if (this.PermittedDevice != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static UserCredentialPasswordIp CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<UserCredentialPasswordIp>(json);
+            return BunqModel.CreateFromJsonString<UserCredentialPasswordIp>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/UserLegalName.cs b/BunqSdk/Model/Generated/Endpoint/UserLegalName.cs
index 3d321d0..9c0d41d 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserLegalName.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserLegalName.cs
@@ -1,7 +1,11 @@
-using System.Collections.Generic;
+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
 {
@@ -14,34 +18,32 @@ public class UserLegalName : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_LISTING = "user/{0}/legal-name";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "UserLegalNameArray";
-
+    
         /// <summary>
         /// All legal names that can be used by the user
         /// </summary>
         [JsonProperty(PropertyName = "legal_names")]
         public List<string> LegalNames { get; set; }
-
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<List<UserLegalName>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<UserLegalName>> List( 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()), urlParams,
-                customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
             return FromJsonList<UserLegalName>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -50,15 +52,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static UserLegalName CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<UserLegalName>(json);
+            return BunqModel.CreateFromJsonString<UserLegalName>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/UserLight.cs b/BunqSdk/Model/Generated/Endpoint/UserLight.cs
deleted file mode 100644
index d501fb3..0000000
--- a/BunqSdk/Model/Generated/Endpoint/UserLight.cs
+++ /dev/null
@@ -1,445 +0,0 @@
-using System.Collections.Generic;
-using Bunq.Sdk.Model.Core;
-using Bunq.Sdk.Model.Generated.Object;
-using Newtonsoft.Json;
-
-namespace Bunq.Sdk.Model.Generated.Endpoint
-{
-    /// <summary>
-    /// Show the authenticated user, if it is a light user.
-    /// </summary>
-    public class UserLight : BunqModel
-    {
-        /// <summary>
-        /// Field constants.
-        /// </summary>
-        public const string FIELD_FIRST_NAME = "first_name";
-        public const string FIELD_MIDDLE_NAME = "middle_name";
-        public const string FIELD_LAST_NAME = "last_name";
-        public const string FIELD_PUBLIC_NICK_NAME = "public_nick_name";
-        public const string FIELD_ADDRESS_MAIN = "address_main";
-        public const string FIELD_ADDRESS_POSTAL = "address_postal";
-        public const string FIELD_AVATAR_UUID = "avatar_uuid";
-        public const string FIELD_SOCIAL_SECURITY_NUMBER = "social_security_number";
-        public const string FIELD_TAX_RESIDENT = "tax_resident";
-        public const string FIELD_DOCUMENT_TYPE = "document_type";
-        public const string FIELD_DOCUMENT_NUMBER = "document_number";
-        public const string FIELD_DOCUMENT_COUNTRY_OF_ISSUANCE = "document_country_of_issuance";
-        public const string FIELD_DOCUMENT_FRONT_ATTACHMENT_ID = "document_front_attachment_id";
-        public const string FIELD_DOCUMENT_BACK_ATTACHMENT_ID = "document_back_attachment_id";
-        public const string FIELD_DATE_OF_BIRTH = "date_of_birth";
-        public const string FIELD_PLACE_OF_BIRTH = "place_of_birth";
-        public const string FIELD_COUNTRY_OF_BIRTH = "country_of_birth";
-        public const string FIELD_NATIONALITY = "nationality";
-        public const string FIELD_LANGUAGE = "language";
-        public const string FIELD_REGION = "region";
-        public const string FIELD_GENDER = "gender";
-        public const string FIELD_STATUS = "status";
-        public const string FIELD_SUB_STATUS = "sub_status";
-        public const string FIELD_LEGAL_GUARDIAN_ALIAS = "legal_guardian_alias";
-        public const string FIELD_SESSION_TIMEOUT = "session_timeout";
-        public const string FIELD_DAILY_LIMIT_WITHOUT_CONFIRMATION_LOGIN = "daily_limit_without_confirmation_login";
-
-
-        /// <summary>
-        /// The user's first name.
-        /// </summary>
-        [JsonProperty(PropertyName = "first_name")]
-        public string FirstName { get; set; }
-
-        /// <summary>
-        /// The user's middle name.
-        /// </summary>
-        [JsonProperty(PropertyName = "middle_name")]
-        public string MiddleName { get; set; }
-
-        /// <summary>
-        /// The user's last name.
-        /// </summary>
-        [JsonProperty(PropertyName = "last_name")]
-        public string LastName { get; set; }
-
-        /// <summary>
-        /// The public nick name for the user.
-        /// </summary>
-        [JsonProperty(PropertyName = "public_nick_name")]
-        public string PublicNickName { get; set; }
-
-        /// <summary>
-        /// The user's main address.
-        /// </summary>
-        [JsonProperty(PropertyName = "address_main")]
-        public Address AddressMain { get; set; }
-
-        /// <summary>
-        /// The user's postal address.
-        /// </summary>
-        [JsonProperty(PropertyName = "address_postal")]
-        public Address AddressPostal { get; set; }
-
-        /// <summary>
-        /// The public UUID of the user's avatar.
-        /// </summary>
-        [JsonProperty(PropertyName = "avatar_uuid")]
-        public string AvatarUuid { get; set; }
-
-        /// <summary>
-        /// The user's social security number.
-        /// </summary>
-        [JsonProperty(PropertyName = "social_security_number")]
-        public string SocialSecurityNumber { get; set; }
-
-        /// <summary>
-        /// The user's tax residence numbers for different countries.
-        /// </summary>
-        [JsonProperty(PropertyName = "tax_resident")]
-        public List<TaxResident> TaxResident { get; set; }
-
-        /// <summary>
-        /// The type of identification document the user registered with.
-        /// </summary>
-        [JsonProperty(PropertyName = "document_type")]
-        public string DocumentType { get; set; }
-
-        /// <summary>
-        /// The identification document number the user registered with.
-        /// </summary>
-        [JsonProperty(PropertyName = "document_number")]
-        public string DocumentNumber { get; set; }
-
-        /// <summary>
-        /// The country which issued the identification document the user registered with.
-        /// </summary>
-        [JsonProperty(PropertyName = "document_country_of_issuance")]
-        public string DocumentCountryOfIssuance { get; set; }
-
-        /// <summary>
-        /// 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; }
-
-        /// <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; }
-
-        /// <summary>
-        /// The user's date of birth. Accepts ISO8601 date formats.
-        /// </summary>
-        [JsonProperty(PropertyName = "date_of_birth")]
-        public string DateOfBirth { get; set; }
-
-        /// <summary>
-        /// The user's place of birth.
-        /// </summary>
-        [JsonProperty(PropertyName = "place_of_birth")]
-        public string PlaceOfBirth { get; set; }
-
-        /// <summary>
-        /// The user's country of birth. Formatted as a SO 3166-1 alpha-2 country code.
-        /// </summary>
-        [JsonProperty(PropertyName = "country_of_birth")]
-        public string CountryOfBirth { get; set; }
-
-        /// <summary>
-        /// The user's nationality. Formatted as a SO 3166-1 alpha-2 country code.
-        /// </summary>
-        [JsonProperty(PropertyName = "nationality")]
-        public string Nationality { get; set; }
-
-        /// <summary>
-        /// The user's preferred language. Formatted as a ISO 639-1 language code plus a ISO 3166-1 alpha-2 country
-        /// code, seperated by an underscore.
-        /// </summary>
-        [JsonProperty(PropertyName = "language")]
-        public string Language { get; set; }
-
-        /// <summary>
-        /// The user's preferred region. Formatted as a ISO 639-1 language code plus a ISO 3166-1 alpha-2 country code,
-        /// seperated by an underscore.
-        /// </summary>
-        [JsonProperty(PropertyName = "region")]
-        public string Region { get; set; }
-
-        /// <summary>
-        /// The user's gender. Can be MALE, FEMALE or UNKNOWN.
-        /// </summary>
-        [JsonProperty(PropertyName = "gender")]
-        public string Gender { get; set; }
-
-        /// <summary>
-        /// The user status. The user status. Can be: ACTIVE, BLOCKED, SIGNUP, DENIED or ABORTED.
-        /// </summary>
-        [JsonProperty(PropertyName = "status")]
-        public string Status { get; set; }
-
-        /// <summary>
-        /// The user sub-status. Can be: NONE, FACE_RESET, APPROVAL, APPROVAL_PARENT, AWAITING_PARENT, APPROVAL_SUPPORT,
-        /// COUNTER_IBAN, IDEAL or SUBMIT.
-        /// </summary>
-        [JsonProperty(PropertyName = "sub_status")]
-        public string SubStatus { get; set; }
-
-        /// <summary>
-        /// The legal guardian of the user. Required for minors.
-        /// </summary>
-        [JsonProperty(PropertyName = "legal_guardian_alias")]
-        public MonetaryAccountReference LegalGuardianAlias { get; set; }
-
-        /// <summary>
-        /// The setting for the session timeout of the user in seconds.
-        /// </summary>
-        [JsonProperty(PropertyName = "session_timeout")]
-        public int? SessionTimeout { get; set; }
-
-        /// <summary>
-        /// The amount the user can pay in the session without asking for credentials.
-        /// </summary>
-        [JsonProperty(PropertyName = "daily_limit_without_confirmation_login")]
-        public Amount DailyLimitWithoutConfirmationLogin { get; set; }
-
-        /// <summary>
-        /// The id of the user.
-        /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
-
-        /// <summary>
-        /// The timestamp of the user object's creation.
-        /// </summary>
-        [JsonProperty(PropertyName = "created")]
-        public string Created { get; set; }
-
-        /// <summary>
-        /// The timestamp of the user object's last update.
-        /// </summary>
-        [JsonProperty(PropertyName = "updated")]
-        public string Updated { get; set; }
-
-        /// <summary>
-        /// The user's public UUID.
-        /// </summary>
-        [JsonProperty(PropertyName = "public_uuid")]
-        public string PublicUuid { get; set; }
-
-        /// <summary>
-        /// The user's legal name.
-        /// </summary>
-        [JsonProperty(PropertyName = "legal_name")]
-        public string LegalName { get; set; }
-
-        /// <summary>
-        /// The display name for the user.
-        /// </summary>
-        [JsonProperty(PropertyName = "display_name")]
-        public string DisplayName { get; set; }
-
-        /// <summary>
-        /// The aliases of the user.
-        /// </summary>
-        [JsonProperty(PropertyName = "alias")]
-        public List<Pointer> Alias { get; set; }
-
-        /// <summary>
-        /// The user's avatar.
-        /// </summary>
-        [JsonProperty(PropertyName = "avatar")]
-        public Avatar Avatar { get; set; }
-
-        /// <summary>
-        /// The version of the terms of service accepted by the user.
-        /// </summary>
-        [JsonProperty(PropertyName = "version_terms_of_service")]
-        public string VersionTermsOfService { get; set; }
-
-        /// <summary>
-        /// The types of notifications that will result in a push notification or URL callback for this UserLight.
-        /// </summary>
-        [JsonProperty(PropertyName = "notification_filters")]
-        public List<NotificationFilter> NotificationFilters { get; set; }
-
-        /// <summary>
-        /// The user deny reason.
-        /// </summary>
-        [JsonProperty(PropertyName = "deny_reason")]
-        public string DenyReason { get; set; }
-
-        /// <summary>
-        /// The relations for this user.
-        /// </summary>
-        [JsonProperty(PropertyName = "relations")]
-        public List<RelationUser> Relations { get; set; }
-
-
-        /// <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.PublicUuid != null)
-            {
-                return false;
-            }
-
-            if (this.FirstName != null)
-            {
-                return false;
-            }
-
-            if (this.MiddleName != null)
-            {
-                return false;
-            }
-
-            if (this.LastName != null)
-            {
-                return false;
-            }
-
-            if (this.LegalName != null)
-            {
-                return false;
-            }
-
-            if (this.DisplayName != null)
-            {
-                return false;
-            }
-
-            if (this.PublicNickName != null)
-            {
-                return false;
-            }
-
-            if (this.Alias != null)
-            {
-                return false;
-            }
-
-            if (this.SocialSecurityNumber != null)
-            {
-                return false;
-            }
-
-            if (this.TaxResident != null)
-            {
-                return false;
-            }
-
-            if (this.AddressMain != null)
-            {
-                return false;
-            }
-
-            if (this.AddressPostal != null)
-            {
-                return false;
-            }
-
-            if (this.DateOfBirth != null)
-            {
-                return false;
-            }
-
-            if (this.PlaceOfBirth != null)
-            {
-                return false;
-            }
-
-            if (this.CountryOfBirth != null)
-            {
-                return false;
-            }
-
-            if (this.Nationality != null)
-            {
-                return false;
-            }
-
-            if (this.Language != null)
-            {
-                return false;
-            }
-
-            if (this.Region != null)
-            {
-                return false;
-            }
-
-            if (this.Gender != null)
-            {
-                return false;
-            }
-
-            if (this.Avatar != null)
-            {
-                return false;
-            }
-
-            if (this.VersionTermsOfService != null)
-            {
-                return false;
-            }
-
-            if (this.Status != null)
-            {
-                return false;
-            }
-
-            if (this.SubStatus != null)
-            {
-                return false;
-            }
-
-            if (this.SessionTimeout != null)
-            {
-                return false;
-            }
-
-            if (this.DailyLimitWithoutConfirmationLogin != null)
-            {
-                return false;
-            }
-
-            if (this.NotificationFilters != null)
-            {
-                return false;
-            }
-
-            if (this.DenyReason != null)
-            {
-                return false;
-            }
-
-            if (this.Relations != null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// </summary>
-        public static UserLight CreateFromJsonString(string json)
-        {
-            return CreateFromJsonString<UserLight>(json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/BunqSdk/Model/Generated/Endpoint/UserPaymentServiceProvider.cs b/BunqSdk/Model/Generated/Endpoint/UserPaymentServiceProvider.cs
index 2761dd6..916c63e 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserPaymentServiceProvider.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserPaymentServiceProvider.cs
@@ -1,8 +1,12 @@
-using System.Collections.Generic;
+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
 {
@@ -15,114 +19,112 @@ public class UserPaymentServiceProvider : BunqModel
         /// Endpoint constants.
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user-payment-service-provider/{0}";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "UserPaymentServiceProvider";
-
+    
         /// <summary>
         /// The id of the user.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the user object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the user object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The distinguished name from the certificate used to identify this user.
         /// </summary>
         [JsonProperty(PropertyName = "certificate_distinguished_name")]
         public string CertificateDistinguishedName { get; set; }
-
+    
         /// <summary>
         /// The aliases of the user.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public List<Pointer> Alias { get; set; }
-
+    
         /// <summary>
         /// The user's avatar.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The user status. The user status. Can be: ACTIVE, BLOCKED or DENIED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The user sub-status. Can be: NONE
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The providers's public UUID.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The display name for the provider.
         /// </summary>
         [JsonProperty(PropertyName = "display_name")]
         public string DisplayName { get; set; }
-
+    
         /// <summary>
         /// The public nick name for the provider.
         /// </summary>
         [JsonProperty(PropertyName = "public_nick_name")]
         public string PublicNickName { get; set; }
-
+    
         /// <summary>
         /// The provider's language. Formatted as a ISO 639-1 language code plus a ISO 3166-1 alpha-2 country code,
         /// separated by an underscore.
         /// </summary>
         [JsonProperty(PropertyName = "language")]
         public string Language { get; set; }
-
+    
         /// <summary>
         /// The provider's region. Formatted as a ISO 639-1 language code plus a ISO 3166-1 alpha-2 country code,
         /// separated by an underscore.
         /// </summary>
         [JsonProperty(PropertyName = "region")]
         public string Region { get; set; }
-
+    
         /// <summary>
         /// The setting for the session timeout of the user in seconds.
         /// </summary>
         [JsonProperty(PropertyName = "session_timeout")]
         public int? SessionTimeout { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
-        public static BunqResponse<UserPaymentServiceProvider> Get(int userPaymentServiceProviderId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<UserPaymentServiceProvider> Get(int userPaymentServiceProviderId, 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, userPaymentServiceProviderId),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, userPaymentServiceProviderId), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<UserPaymentServiceProvider>(responseRaw, OBJECT_TYPE_GET);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -131,80 +133,80 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.CertificateDistinguishedName != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.DisplayName != null)
             {
                 return false;
             }
-
+    
             if (this.PublicNickName != null)
             {
                 return false;
             }
-
+    
             if (this.Language != null)
             {
                 return false;
             }
-
+    
             if (this.Region != null)
             {
                 return false;
             }
-
+    
             if (this.SessionTimeout != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static UserPaymentServiceProvider CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<UserPaymentServiceProvider>(json);
+            return BunqModel.CreateFromJsonString<UserPaymentServiceProvider>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/UserPerson.cs b/BunqSdk/Model/Generated/Endpoint/UserPerson.cs
index 5ee2d5a..e11f800 100644
--- a/BunqSdk/Model/Generated/Endpoint/UserPerson.cs
+++ b/BunqSdk/Model/Generated/Endpoint/UserPerson.cs
@@ -1,10 +1,12 @@
-using System.Collections.Generic;
-using System.Text;
+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
 {
@@ -20,7 +22,7 @@ public class UserPerson : BunqModel
         /// </summary>
         protected const string ENDPOINT_URL_READ = "user-person/{0}";
         protected const string ENDPOINT_URL_UPDATE = "user-person/{0}";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
@@ -50,246 +52,245 @@ public class UserPerson : BunqModel
         public const string FIELD_SESSION_TIMEOUT = "session_timeout";
         public const string FIELD_DAILY_LIMIT_WITHOUT_CONFIRMATION_LOGIN = "daily_limit_without_confirmation_login";
         public const string FIELD_DISPLAY_NAME = "display_name";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
         private const string OBJECT_TYPE_GET = "UserPerson";
-
+    
         /// <summary>
         /// The person's first name.
         /// </summary>
         [JsonProperty(PropertyName = "first_name")]
         public string FirstName { get; set; }
-
+    
         /// <summary>
         /// The person's middle name.
         /// </summary>
         [JsonProperty(PropertyName = "middle_name")]
         public string MiddleName { get; set; }
-
+    
         /// <summary>
         /// The person's last name.
         /// </summary>
         [JsonProperty(PropertyName = "last_name")]
         public string LastName { get; set; }
-
+    
         /// <summary>
         /// The public nick name for the person.
         /// </summary>
         [JsonProperty(PropertyName = "public_nick_name")]
         public string PublicNickName { get; set; }
-
+    
         /// <summary>
         /// The person's main address.
         /// </summary>
         [JsonProperty(PropertyName = "address_main")]
         public Address AddressMain { get; set; }
-
+    
         /// <summary>
         /// The person's postal address.
         /// </summary>
         [JsonProperty(PropertyName = "address_postal")]
         public Address AddressPostal { get; set; }
-
+    
         /// <summary>
         /// The public UUID of the user's avatar.
         /// </summary>
         [JsonProperty(PropertyName = "avatar_uuid")]
         public string AvatarUuid { get; set; }
-
+    
         /// <summary>
         /// The user's tax residence numbers for different countries.
         /// </summary>
         [JsonProperty(PropertyName = "tax_resident")]
         public List<TaxResident> TaxResident { get; set; }
-
+    
         /// <summary>
         /// The type of identification document the person registered with.
         /// </summary>
         [JsonProperty(PropertyName = "document_type")]
         public string DocumentType { get; set; }
-
+    
         /// <summary>
         /// The identification document number the person registered with.
         /// </summary>
         [JsonProperty(PropertyName = "document_number")]
         public string DocumentNumber { get; set; }
-
+    
         /// <summary>
         /// The country which issued the identification document the person registered with.
         /// </summary>
         [JsonProperty(PropertyName = "document_country_of_issuance")]
         public string DocumentCountryOfIssuance { get; set; }
-
+    
         /// <summary>
         /// 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; }
-
+    
         /// <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; }
-
+    
         /// <summary>
         /// The person's date of birth. Accepts ISO8601 date formats.
         /// </summary>
         [JsonProperty(PropertyName = "date_of_birth")]
         public string DateOfBirth { get; set; }
-
+    
         /// <summary>
         /// The person's place of birth.
         /// </summary>
         [JsonProperty(PropertyName = "place_of_birth")]
         public string PlaceOfBirth { get; set; }
-
+    
         /// <summary>
         /// The person's country of birth. Formatted as a SO 3166-1 alpha-2 country code.
         /// </summary>
         [JsonProperty(PropertyName = "country_of_birth")]
         public string CountryOfBirth { get; set; }
-
+    
         /// <summary>
         /// The person's nationality. Formatted as a SO 3166-1 alpha-2 country code.
         /// </summary>
         [JsonProperty(PropertyName = "nationality")]
         public string Nationality { get; set; }
-
+    
         /// <summary>
         /// The person's preferred language. Formatted as a ISO 639-1 language code plus a ISO 3166-1 alpha-2 country
         /// code, seperated by an underscore.
         /// </summary>
         [JsonProperty(PropertyName = "language")]
         public string Language { get; set; }
-
+    
         /// <summary>
         /// The person's preferred region. Formatted as a ISO 639-1 language code plus a ISO 3166-1 alpha-2 country
         /// code, seperated by an underscore.
         /// </summary>
         [JsonProperty(PropertyName = "region")]
         public string Region { get; set; }
-
+    
         /// <summary>
         /// The person's gender. Can be MALE, FEMALE or UNKNOWN.
         /// </summary>
         [JsonProperty(PropertyName = "gender")]
         public string Gender { get; set; }
-
+    
         /// <summary>
         /// The user status. The user status. Can be: ACTIVE, BLOCKED, SIGNUP, RECOVERY, DENIED or ABORTED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The user sub-status. Can be: NONE, FACE_RESET, APPROVAL, APPROVAL_DIRECTOR, APPROVAL_PARENT,
         /// APPROVAL_SUPPORT, COUNTER_IBAN, IDEAL or SUBMIT.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The legal guardian of the user. Required for minors.
         /// </summary>
         [JsonProperty(PropertyName = "legal_guardian_alias")]
         public MonetaryAccountReference LegalGuardianAlias { get; set; }
-
+    
         /// <summary>
         /// The setting for the session timeout of the user in seconds.
         /// </summary>
         [JsonProperty(PropertyName = "session_timeout")]
         public int? SessionTimeout { get; set; }
-
+    
         /// <summary>
         /// The amount the user can pay in the session without asking for credentials.
         /// </summary>
         [JsonProperty(PropertyName = "daily_limit_without_confirmation_login")]
         public Amount DailyLimitWithoutConfirmationLogin { get; set; }
-
+    
         /// <summary>
         /// The display name for the person.
         /// </summary>
         [JsonProperty(PropertyName = "display_name")]
         public string DisplayName { get; set; }
-
+    
         /// <summary>
         /// The id of the modified person object.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the person object's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the person object's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The person's public UUID.
         /// </summary>
         [JsonProperty(PropertyName = "public_uuid")]
         public string PublicUuid { get; set; }
-
+    
         /// <summary>
         /// The person's legal name.
         /// </summary>
         [JsonProperty(PropertyName = "legal_name")]
         public string LegalName { get; set; }
-
+    
         /// <summary>
         /// The aliases of the user.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public List<Pointer> Alias { get; set; }
-
+    
         /// <summary>
         /// The user's avatar.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The version of the terms of service accepted by the user.
         /// </summary>
         [JsonProperty(PropertyName = "version_terms_of_service")]
         public string VersionTermsOfService { get; set; }
-
+    
         /// <summary>
         /// The types of notifications that will result in a push notification or URL callback for this UserPerson.
         /// </summary>
         [JsonProperty(PropertyName = "notification_filters")]
         public List<NotificationFilter> NotificationFilters { get; set; }
-
+    
         /// <summary>
         /// The relations for this user.
         /// </summary>
         [JsonProperty(PropertyName = "relations")]
         public List<RelationUser> Relations { get; set; }
-
-
+    
+    
         /// <summary>
         /// Get a specific person.
         /// </summary>
-        public static BunqResponse<UserPerson> Get(IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<UserPerson> Get( 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()),
-                new Dictionary<string, string>(), customHeaders);
-
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId()), new Dictionary<string, string>(), customHeaders);
+    
             return FromJson<UserPerson>(responseRaw, OBJECT_TYPE_GET);
         }
-
+    
         /// <summary>
         /// Modify a specific person object's data.
         /// </summary>
@@ -319,59 +320,49 @@ public static BunqResponse<UserPerson> Get(IDictionary<string, string> customHea
         /// <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, Address addressMain = null,
-            Address addressPostal = null, string avatarUuid = null, List<TaxResident> taxResident = null,
-            string documentType = null, string documentNumber = null, string documentCountryOfIssuance = null,
-            int? documentFrontAttachmentId = null, int? documentBackAttachmentId = null, string dateOfBirth = null,
-            string placeOfBirth = null, string countryOfBirth = null, string nationality = null, string language = null,
-            string region = null, string gender = null, string status = null, string subStatus = null,
-            Pointer legalGuardianAlias = null, int? sessionTimeout = null,
-            Amount dailyLimitWithoutConfirmationLogin = null, string displayName = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(string firstName = null, string middleName = null, string lastName = null, string publicNickName = null, Address addressMain = null, Address addressPostal = null, string avatarUuid = null, List<TaxResident> taxResident = null, string documentType = null, string documentNumber = null, string documentCountryOfIssuance = null, int? documentFrontAttachmentId = null, int? documentBackAttachmentId = null, string dateOfBirth = null, string placeOfBirth = null, string countryOfBirth = null, string nationality = null, string language = null, string region = null, string gender = null, string status = null, string subStatus = null, Pointer legalGuardianAlias = null, int? sessionTimeout = null, Amount dailyLimitWithoutConfirmationLogin = null, string displayName = 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_FIRST_NAME, firstName},
-                {FIELD_MIDDLE_NAME, middleName},
-                {FIELD_LAST_NAME, lastName},
-                {FIELD_PUBLIC_NICK_NAME, publicNickName},
-                {FIELD_ADDRESS_MAIN, addressMain},
-                {FIELD_ADDRESS_POSTAL, addressPostal},
-                {FIELD_AVATAR_UUID, avatarUuid},
-                {FIELD_TAX_RESIDENT, taxResident},
-                {FIELD_DOCUMENT_TYPE, documentType},
-                {FIELD_DOCUMENT_NUMBER, documentNumber},
-                {FIELD_DOCUMENT_COUNTRY_OF_ISSUANCE, documentCountryOfIssuance},
-                {FIELD_DOCUMENT_FRONT_ATTACHMENT_ID, documentFrontAttachmentId},
-                {FIELD_DOCUMENT_BACK_ATTACHMENT_ID, documentBackAttachmentId},
-                {FIELD_DATE_OF_BIRTH, dateOfBirth},
-                {FIELD_PLACE_OF_BIRTH, placeOfBirth},
-                {FIELD_COUNTRY_OF_BIRTH, countryOfBirth},
-                {FIELD_NATIONALITY, nationality},
-                {FIELD_LANGUAGE, language},
-                {FIELD_REGION, region},
-                {FIELD_GENDER, gender},
-                {FIELD_STATUS, status},
-                {FIELD_SUB_STATUS, subStatus},
-                {FIELD_LEGAL_GUARDIAN_ALIAS, legalGuardianAlias},
-                {FIELD_SESSION_TIMEOUT, sessionTimeout},
-                {FIELD_DAILY_LIMIT_WITHOUT_CONFIRMATION_LOGIN, dailyLimitWithoutConfirmationLogin},
-                {FIELD_DISPLAY_NAME, displayName},
-            };
-
+    {
+    {FIELD_FIRST_NAME, firstName},
+    {FIELD_MIDDLE_NAME, middleName},
+    {FIELD_LAST_NAME, lastName},
+    {FIELD_PUBLIC_NICK_NAME, publicNickName},
+    {FIELD_ADDRESS_MAIN, addressMain},
+    {FIELD_ADDRESS_POSTAL, addressPostal},
+    {FIELD_AVATAR_UUID, avatarUuid},
+    {FIELD_TAX_RESIDENT, taxResident},
+    {FIELD_DOCUMENT_TYPE, documentType},
+    {FIELD_DOCUMENT_NUMBER, documentNumber},
+    {FIELD_DOCUMENT_COUNTRY_OF_ISSUANCE, documentCountryOfIssuance},
+    {FIELD_DOCUMENT_FRONT_ATTACHMENT_ID, documentFrontAttachmentId},
+    {FIELD_DOCUMENT_BACK_ATTACHMENT_ID, documentBackAttachmentId},
+    {FIELD_DATE_OF_BIRTH, dateOfBirth},
+    {FIELD_PLACE_OF_BIRTH, placeOfBirth},
+    {FIELD_COUNTRY_OF_BIRTH, countryOfBirth},
+    {FIELD_NATIONALITY, nationality},
+    {FIELD_LANGUAGE, language},
+    {FIELD_REGION, region},
+    {FIELD_GENDER, gender},
+    {FIELD_STATUS, status},
+    {FIELD_SUB_STATUS, subStatus},
+    {FIELD_LEGAL_GUARDIAN_ALIAS, legalGuardianAlias},
+    {FIELD_SESSION_TIMEOUT, sessionTimeout},
+    {FIELD_DAILY_LIMIT_WITHOUT_CONFIRMATION_LOGIN, dailyLimitWithoutConfirmationLogin},
+    {FIELD_DISPLAY_NAME, displayName},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -380,155 +371,155 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.PublicUuid != null)
             {
                 return false;
             }
-
+    
             if (this.FirstName != null)
             {
                 return false;
             }
-
+    
             if (this.MiddleName != null)
             {
                 return false;
             }
-
+    
             if (this.LastName != null)
             {
                 return false;
             }
-
+    
             if (this.LegalName != null)
             {
                 return false;
             }
-
+    
             if (this.DisplayName != null)
             {
                 return false;
             }
-
+    
             if (this.PublicNickName != null)
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.TaxResident != null)
             {
                 return false;
             }
-
+    
             if (this.AddressMain != null)
             {
                 return false;
             }
-
+    
             if (this.AddressPostal != null)
             {
                 return false;
             }
-
+    
             if (this.DateOfBirth != null)
             {
                 return false;
             }
-
+    
             if (this.PlaceOfBirth != null)
             {
                 return false;
             }
-
+    
             if (this.CountryOfBirth != null)
             {
                 return false;
             }
-
+    
             if (this.Nationality != null)
             {
                 return false;
             }
-
+    
             if (this.Language != null)
             {
                 return false;
             }
-
+    
             if (this.Region != null)
             {
                 return false;
             }
-
+    
             if (this.Gender != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.VersionTermsOfService != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.SessionTimeout != null)
             {
                 return false;
             }
-
+    
             if (this.DailyLimitWithoutConfirmationLogin != null)
             {
                 return false;
             }
-
+    
             if (this.NotificationFilters != null)
             {
                 return false;
             }
-
+    
             if (this.Relations != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static UserPerson CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<UserPerson>(json);
+            return BunqModel.CreateFromJsonString<UserPerson>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/Whitelist.cs b/BunqSdk/Model/Generated/Endpoint/Whitelist.cs
index 07c7891..2805fe8 100644
--- a/BunqSdk/Model/Generated/Endpoint/Whitelist.cs
+++ b/BunqSdk/Model/Generated/Endpoint/Whitelist.cs
@@ -1,4 +1,6 @@
 using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -7,18 +9,19 @@ namespace Bunq.Sdk.Model.Generated.Endpoint
     /// </summary>
     public class Whitelist : BunqModel
     {
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Whitelist CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Whitelist>(json);
+            return BunqModel.CreateFromJsonString<Whitelist>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistResult.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistResult.cs
index e35bf9e..2215d43 100644
--- a/BunqSdk/Model/Generated/Endpoint/WhitelistResult.cs
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistResult.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Object;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Endpoint
 {
@@ -15,50 +15,51 @@ public class WhitelistResult : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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; }
-
+    
         /// <summary>
         /// The status of the WhitelistResult.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The subStatus of the WhitelistResult.
         /// </summary>
         [JsonProperty(PropertyName = "sub_status")]
         public string SubStatus { get; set; }
-
+    
         /// <summary>
         /// The message when the whitelist result has failed due to user error.
         /// </summary>
         [JsonProperty(PropertyName = "error_message")]
         public List<Error> ErrorMessage { get; set; }
-
+    
         /// <summary>
         /// The corresponding whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "whitelist")]
         public Whitelist Whitelist { get; set; }
-
+    
         /// <summary>
         /// The details of the external object the event was created for.
         /// </summary>
         [JsonProperty(PropertyName = "object")]
         public WhitelistResultViewAnchoredObject Object { get; set; }
-
+    
         /// <summary>
         /// The reference to the object used for split the bill. Can be RequestInquiry or RequestInquiryBatch
         /// </summary>
         [JsonProperty(PropertyName = "request_reference_split_the_bill")]
         public List<RequestInquiryReference> RequestReferenceSplitTheBill { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -67,50 +68,50 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountPayingId != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.SubStatus != null)
             {
                 return false;
             }
-
+    
             if (this.ErrorMessage != null)
             {
                 return false;
             }
-
+    
             if (this.Whitelist != null)
             {
                 return false;
             }
-
+    
             if (this.Object != null)
             {
                 return false;
             }
-
+    
             if (this.RequestReferenceSplitTheBill != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static WhitelistResult CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<WhitelistResult>(json);
+            return BunqModel.CreateFromJsonString<WhitelistResult>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistSdd.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistSdd.cs
index d4553e8..5cfa34f 100644
--- a/BunqSdk/Model/Generated/Endpoint/WhitelistSdd.cs
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistSdd.cs
@@ -1,15 +1,17 @@
-using System.Collections.Generic;
-using System.Text;
+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>
-    /// Whitelist an SDD so that when one comes in, it is automatically accepted.
+    /// Depreciated route, replaced with whitelist-sdd-recurring
     /// </summary>
     public class WhitelistSdd : BunqModel
     {
@@ -21,182 +23,173 @@ public class WhitelistSdd : BunqModel
         protected const string ENDPOINT_URL_UPDATE = "user/{0}/whitelist-sdd/{1}";
         protected const string ENDPOINT_URL_DELETE = "user/{0}/whitelist-sdd/{1}";
         protected const string ENDPOINT_URL_LISTING = "user/{0}/whitelist-sdd";
-
+    
         /// <summary>
         /// Field constants.
         /// </summary>
         public const string FIELD_MONETARY_ACCOUNT_PAYING_ID = "monetary_account_paying_id";
         public const string FIELD_REQUEST_ID = "request_id";
         public const string FIELD_MAXIMUM_AMOUNT_PER_MONTH = "maximum_amount_per_month";
-
+    
         /// <summary>
         /// Object type.
         /// </summary>
-        private const string OBJECT_TYPE_GET = "WhitelistSdd";
-
+        private const string OBJECT_TYPE_GET = "Whitelist";
+    
         /// <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; }
-
+    
         /// <summary>
         /// ID of the request for which you want to whitelist the originating SDD.
         /// </summary>
         [JsonProperty(PropertyName = "request_id")]
         public int? RequestId { get; set; }
-
+    
         /// <summary>
         /// The monthly maximum amount that can be deducted from the target account.
         /// </summary>
         [JsonProperty(PropertyName = "maximum_amount_per_month")]
         public Amount MaximumAmountPerMonth { get; set; }
-
+    
         /// <summary>
         /// The ID of the whitelist entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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; }
-
+    
         /// <summary>
         /// The type of the SDD whitelist, can be CORE or B2B.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The status of the whitelist.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The credit scheme ID provided by the counterparty.
         /// </summary>
         [JsonProperty(PropertyName = "credit_scheme_identifier")]
         public string CreditSchemeIdentifier { get; set; }
-
+    
         /// <summary>
         /// The mandate ID provided by the counterparty.
         /// </summary>
         [JsonProperty(PropertyName = "mandate_identifier")]
         public string MandateIdentifier { get; set; }
-
+    
         /// <summary>
         /// The account to which payments will be paid.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The user who created the whitelist entry.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_created")]
         public LabelUser UserAliasCreated { get; set; }
-
-
+    
+    
         /// <summary>
-        /// Get a specific SDD whitelist entry.
+        /// Get a specific recurring SDD whitelist entry.
         /// </summary>
-        public static BunqResponse<WhitelistSdd> Get(int whitelistSddId,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<WhitelistSdd> Get(int whitelistSddId, 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(), whitelistSddId),
-                new Dictionary<string, string>(), customHeaders);
-
-            return FromJson<WhitelistSdd>(responseRaw, OBJECT_TYPE_GET);
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_READ, DetermineUserId(), whitelistSddId), new Dictionary<string, string>(), customHeaders);
+    
+            return FromJson<WhitelistSdd>(responseRaw);
         }
-
+    
         /// <summary>
-        /// Create a new SDD whitelist entry.
+        /// Create a new recurring SDD whitelist entry.
         /// </summary>
         /// <param name="monetaryAccountPayingId">ID of the monetary account of which you want to pay from.</param>
         /// <param name="requestId">ID of the request for which you want to whitelist the originating SDD.</param>
         /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted based on the whitelist.</param>
-        public static BunqResponse<int> Create(int? monetaryAccountPayingId, int? requestId,
-            Amount maximumAmountPerMonth, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Create(int? monetaryAccountPayingId, int? requestId, Amount maximumAmountPerMonth, 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_MONETARY_ACCOUNT_PAYING_ID, monetaryAccountPayingId},
-                {FIELD_REQUEST_ID, requestId},
-                {FIELD_MAXIMUM_AMOUNT_PER_MONTH, maximumAmountPerMonth},
-            };
-
+    {
+    {FIELD_MONETARY_ACCOUNT_PAYING_ID, monetaryAccountPayingId},
+    {FIELD_REQUEST_ID, requestId},
+    {FIELD_MAXIMUM_AMOUNT_PER_MONTH, maximumAmountPerMonth},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes,
-                customHeaders);
-
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
         /// <param name="monetaryAccountPayingId">ID of the monetary account of which you want to pay from.</param>
         /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted based on the whitelist.</param>
-        public static BunqResponse<int> Update(int whitelistSddId, int? monetaryAccountPayingId = null,
-            Amount maximumAmountPerMonth = null, IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<int> Update(int whitelistSddId, int? monetaryAccountPayingId = null, Amount maximumAmountPerMonth = 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_MONETARY_ACCOUNT_PAYING_ID, monetaryAccountPayingId},
-                {FIELD_MAXIMUM_AMOUNT_PER_MONTH, maximumAmountPerMonth},
-            };
-
+    {
+    {FIELD_MONETARY_ACCOUNT_PAYING_ID, monetaryAccountPayingId},
+    {FIELD_MAXIMUM_AMOUNT_PER_MONTH, maximumAmountPerMonth},
+    };
+    
             var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
-            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), whitelistSddId),
-                requestBytes, customHeaders);
-
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), whitelistSddId), requestBytes, customHeaders);
+    
             return ProcessForId(responseRaw);
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqResponse<object> Delete(int whitelistSddId, 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(), whitelistSddId),
-                customHeaders);
-
+            var responseRaw = apiClient.Delete(string.Format(ENDPOINT_URL_DELETE, DetermineUserId(), whitelistSddId), customHeaders);
+    
             return new BunqResponse<object>(null, responseRaw.Headers);
         }
-
+    
         /// <summary>
-        /// Get a listing of all SDD whitelist entries for a target monetary account.
+        /// Get a listing of all recurring SDD whitelist entries for a target monetary account.
         /// </summary>
-        public static BunqResponse<List<WhitelistSdd>> List(IDictionary<string, string> urlParams = null,
-            IDictionary<string, string> customHeaders = null)
+        public static BunqResponse<List<WhitelistSdd>> List( 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()), urlParams,
-                customHeaders);
-
-            return FromJsonList<WhitelistSdd>(responseRaw, OBJECT_TYPE_GET);
+            var responseRaw = apiClient.Get(string.Format(ENDPOINT_URL_LISTING, DetermineUserId()), urlParams, customHeaders);
+    
+            return FromJsonList<WhitelistSdd>(responseRaw);
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -205,60 +198,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountIncomingId != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountPayingId != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.CreditSchemeIdentifier != null)
             {
                 return false;
             }
-
+    
             if (this.MandateIdentifier != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.MaximumAmountPerMonth != null)
             {
                 return false;
             }
-
+    
             if (this.UserAliasCreated != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static WhitelistSdd CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<WhitelistSdd>(json);
+            return BunqModel.CreateFromJsonString<WhitelistSdd>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistSddMonetaryAccountPaying.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistSddMonetaryAccountPaying.cs
new file mode 100644
index 0000000..4fd3848
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistSddMonetaryAccountPaying.cs
@@ -0,0 +1,182 @@
+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>
+    /// Whitelist an SDD so that when one comes in, it is automatically accepted.
+    /// </summary>
+    public class WhitelistSddMonetaryAccountPaying : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_READ = "user/{0}/monetary-account/{1}/whitelist-sdd/{2}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/monetary-account/{1}/whitelist-sdd";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "WhitelistSdd";
+    
+        /// <summary>
+        /// The ID of the whitelist entry.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public int? 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; }
+    
+        /// <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; }
+    
+        /// <summary>
+        /// The type of the SDD whitelist, can be CORE or B2B.
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+    
+        /// <summary>
+        /// The status of the whitelist.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+    
+        /// <summary>
+        /// The credit scheme ID provided by the counterparty.
+        /// </summary>
+        [JsonProperty(PropertyName = "credit_scheme_identifier")]
+        public string CreditSchemeIdentifier { get; set; }
+    
+        /// <summary>
+        /// The mandate ID provided by the counterparty.
+        /// </summary>
+        [JsonProperty(PropertyName = "mandate_identifier")]
+        public string MandateIdentifier { get; set; }
+    
+        /// <summary>
+        /// The account to which payments will be paid.
+        /// </summary>
+        [JsonProperty(PropertyName = "counterparty_alias")]
+        public MonetaryAccountReference CounterpartyAlias { get; set; }
+    
+        /// <summary>
+        /// The monthly maximum amount that can be deducted from the target account.
+        /// </summary>
+        [JsonProperty(PropertyName = "maximum_amount_per_month")]
+        public Amount MaximumAmountPerMonth { get; set; }
+    
+        /// <summary>
+        /// The user who created the whitelist entry.
+        /// </summary>
+        [JsonProperty(PropertyName = "user_alias_created")]
+        public LabelUser UserAliasCreated { get; set; }
+    
+    
+        /// <summary>
+        /// Get a specific SDD whitelist entry.
+        /// </summary>
+        public static BunqResponse<WhitelistSddMonetaryAccountPaying> Get(int whitelistSddMonetaryAccountPayingId, int? 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), whitelistSddMonetaryAccountPayingId), new Dictionary<string, string>(), customHeaders);
+    
+            return FromJson<WhitelistSddMonetaryAccountPaying>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+        /// <summary>
+        /// Get a listing of all SDD whitelist entries for a target monetary account.
+        /// </summary>
+        public static BunqResponse<List<WhitelistSddMonetaryAccountPaying>> List(int? 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<WhitelistSddMonetaryAccountPaying>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Id != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountIncomingId != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountPayingId != null)
+            {
+                return false;
+            }
+    
+            if (this.Type != null)
+            {
+                return false;
+            }
+    
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.CreditSchemeIdentifier != null)
+            {
+                return false;
+            }
+    
+            if (this.MandateIdentifier != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterpartyAlias != null)
+            {
+                return false;
+            }
+    
+            if (this.MaximumAmountPerMonth != null)
+            {
+                return false;
+            }
+    
+            if (this.UserAliasCreated != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static WhitelistSddMonetaryAccountPaying CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<WhitelistSddMonetaryAccountPaying>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistSddOneOff.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistSddOneOff.cs
new file mode 100644
index 0000000..72999db
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistSddOneOff.cs
@@ -0,0 +1,247 @@
+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>
+    /// Whitelist an one off SDD so that when another one off SDD from the creditor comes in, it is automatically
+    /// accepted.
+    /// </summary>
+    public class WhitelistSddOneOff : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_READ = "user/{0}/whitelist-sdd-one-off/{1}";
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/whitelist-sdd-one-off";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/whitelist-sdd-one-off/{1}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/whitelist-sdd-one-off/{1}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/whitelist-sdd-one-off";
+    
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_MONETARY_ACCOUNT_PAYING_ID = "monetary_account_paying_id";
+        public const string FIELD_REQUEST_ID = "request_id";
+        public const string FIELD_MAXIMUM_AMOUNT_PER_MONTH = "maximum_amount_per_month";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "WhitelistSddOneOff";
+    
+        /// <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; }
+    
+        /// <summary>
+        /// ID of the request for which you want to whitelist the originating SDD.
+        /// </summary>
+        [JsonProperty(PropertyName = "request_id")]
+        public int? RequestId { get; set; }
+    
+        /// <summary>
+        /// The monthly maximum amount that can be deducted from the target account.
+        /// </summary>
+        [JsonProperty(PropertyName = "maximum_amount_per_month")]
+        public Amount MaximumAmountPerMonth { get; set; }
+    
+        /// <summary>
+        /// The ID of the whitelist entry.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public int? 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; }
+    
+        /// <summary>
+        /// The type of the SDD whitelist, can be CORE or B2B.
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+    
+        /// <summary>
+        /// The status of the whitelist.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+    
+        /// <summary>
+        /// The credit scheme ID provided by the counterparty.
+        /// </summary>
+        [JsonProperty(PropertyName = "credit_scheme_identifier")]
+        public string CreditSchemeIdentifier { get; set; }
+    
+        /// <summary>
+        /// The account to which payments will be paid.
+        /// </summary>
+        [JsonProperty(PropertyName = "counterparty_alias")]
+        public MonetaryAccountReference CounterpartyAlias { get; set; }
+    
+        /// <summary>
+        /// The user who created the whitelist entry.
+        /// </summary>
+        [JsonProperty(PropertyName = "user_alias_created")]
+        public LabelUser UserAliasCreated { get; set; }
+    
+    
+        /// <summary>
+        /// Get a specific one off SDD whitelist entry.
+        /// </summary>
+        public static BunqResponse<WhitelistSddOneOff> Get(int whitelistSddOneOffId, 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(), whitelistSddOneOffId), new Dictionary<string, string>(), customHeaders);
+    
+            return FromJson<WhitelistSddOneOff>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+        /// <summary>
+        /// Create a new one off SDD whitelist entry.
+        /// </summary>
+        /// <param name="monetaryAccountPayingId">ID of the monetary account of which you want to pay from.</param>
+        /// <param name="requestId">ID of the request for which you want to whitelist the originating SDD.</param>
+        /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted based on the whitelist.</param>
+        public static BunqResponse<int> Create(int? monetaryAccountPayingId, int? requestId, Amount maximumAmountPerMonth = 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_MONETARY_ACCOUNT_PAYING_ID, monetaryAccountPayingId},
+    {FIELD_REQUEST_ID, requestId},
+    {FIELD_MAXIMUM_AMOUNT_PER_MONTH, maximumAmountPerMonth},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        /// <param name="monetaryAccountPayingId">ID of the monetary account of which you want to pay from.</param>
+        /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted based on the whitelist.</param>
+        public static BunqResponse<int> Update(int whitelistSddOneOffId, int? monetaryAccountPayingId = null, Amount maximumAmountPerMonth = 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_MONETARY_ACCOUNT_PAYING_ID, monetaryAccountPayingId},
+    {FIELD_MAXIMUM_AMOUNT_PER_MONTH, maximumAmountPerMonth},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), whitelistSddOneOffId), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<object> Delete(int whitelistSddOneOffId, 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(), whitelistSddOneOffId), customHeaders);
+    
+            return new BunqResponse<object>(null, responseRaw.Headers);
+        }
+    
+        /// <summary>
+        /// Get a listing of all one off SDD whitelist entries for a target monetary account.
+        /// </summary>
+        public static BunqResponse<List<WhitelistSddOneOff>> List( 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()), urlParams, customHeaders);
+    
+            return FromJsonList<WhitelistSddOneOff>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Id != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountIncomingId != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountPayingId != null)
+            {
+                return false;
+            }
+    
+            if (this.Type != null)
+            {
+                return false;
+            }
+    
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.CreditSchemeIdentifier != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterpartyAlias != null)
+            {
+                return false;
+            }
+    
+            if (this.MaximumAmountPerMonth != null)
+            {
+                return false;
+            }
+    
+            if (this.UserAliasCreated != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static WhitelistSddOneOff CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<WhitelistSddOneOff>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Endpoint/WhitelistSddRecurring.cs b/BunqSdk/Model/Generated/Endpoint/WhitelistSddRecurring.cs
new file mode 100644
index 0000000..ccfef38
--- /dev/null
+++ b/BunqSdk/Model/Generated/Endpoint/WhitelistSddRecurring.cs
@@ -0,0 +1,257 @@
+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>
+    /// Whitelist a recurring SDD so that when another recurrence comes in, it is automatically accepted.
+    /// </summary>
+    public class WhitelistSddRecurring : BunqModel
+    {
+        /// <summary>
+        /// Endpoint constants.
+        /// </summary>
+        protected const string ENDPOINT_URL_READ = "user/{0}/whitelist-sdd-recurring/{1}";
+        protected const string ENDPOINT_URL_CREATE = "user/{0}/whitelist-sdd-recurring";
+        protected const string ENDPOINT_URL_UPDATE = "user/{0}/whitelist-sdd-recurring/{1}";
+        protected const string ENDPOINT_URL_DELETE = "user/{0}/whitelist-sdd-recurring/{1}";
+        protected const string ENDPOINT_URL_LISTING = "user/{0}/whitelist-sdd-recurring";
+    
+        /// <summary>
+        /// Field constants.
+        /// </summary>
+        public const string FIELD_MONETARY_ACCOUNT_PAYING_ID = "monetary_account_paying_id";
+        public const string FIELD_REQUEST_ID = "request_id";
+        public const string FIELD_MAXIMUM_AMOUNT_PER_MONTH = "maximum_amount_per_month";
+    
+        /// <summary>
+        /// Object type.
+        /// </summary>
+        private const string OBJECT_TYPE_GET = "WhitelistSddRecurring";
+    
+        /// <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; }
+    
+        /// <summary>
+        /// ID of the request for which you want to whitelist the originating SDD.
+        /// </summary>
+        [JsonProperty(PropertyName = "request_id")]
+        public int? RequestId { get; set; }
+    
+        /// <summary>
+        /// The monthly maximum amount that can be deducted from the target account.
+        /// </summary>
+        [JsonProperty(PropertyName = "maximum_amount_per_month")]
+        public Amount MaximumAmountPerMonth { get; set; }
+    
+        /// <summary>
+        /// The ID of the whitelist entry.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public int? 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; }
+    
+        /// <summary>
+        /// The type of the SDD whitelist, can be CORE or B2B.
+        /// </summary>
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+    
+        /// <summary>
+        /// The status of the whitelist.
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public string Status { get; set; }
+    
+        /// <summary>
+        /// The credit scheme ID provided by the counterparty.
+        /// </summary>
+        [JsonProperty(PropertyName = "credit_scheme_identifier")]
+        public string CreditSchemeIdentifier { get; set; }
+    
+        /// <summary>
+        /// The mandate ID provided by the counterparty.
+        /// </summary>
+        [JsonProperty(PropertyName = "mandate_identifier")]
+        public string MandateIdentifier { get; set; }
+    
+        /// <summary>
+        /// The account to which payments will be paid.
+        /// </summary>
+        [JsonProperty(PropertyName = "counterparty_alias")]
+        public MonetaryAccountReference CounterpartyAlias { get; set; }
+    
+        /// <summary>
+        /// The user who created the whitelist entry.
+        /// </summary>
+        [JsonProperty(PropertyName = "user_alias_created")]
+        public LabelUser UserAliasCreated { get; set; }
+    
+    
+        /// <summary>
+        /// Get a specific recurring SDD whitelist entry.
+        /// </summary>
+        public static BunqResponse<WhitelistSddRecurring> Get(int whitelistSddRecurringId, 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(), whitelistSddRecurringId), new Dictionary<string, string>(), customHeaders);
+    
+            return FromJson<WhitelistSddRecurring>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+        /// <summary>
+        /// Create a new recurring SDD whitelist entry.
+        /// </summary>
+        /// <param name="monetaryAccountPayingId">ID of the monetary account of which you want to pay from.</param>
+        /// <param name="requestId">ID of the request for which you want to whitelist the originating SDD.</param>
+        /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted based on the whitelist.</param>
+        public static BunqResponse<int> Create(int? monetaryAccountPayingId, int? requestId, Amount maximumAmountPerMonth = 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_MONETARY_ACCOUNT_PAYING_ID, monetaryAccountPayingId},
+    {FIELD_REQUEST_ID, requestId},
+    {FIELD_MAXIMUM_AMOUNT_PER_MONTH, maximumAmountPerMonth},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Post(string.Format(ENDPOINT_URL_CREATE, DetermineUserId()), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        /// <param name="monetaryAccountPayingId">ID of the monetary account of which you want to pay from.</param>
+        /// <param name="maximumAmountPerMonth">The maximum amount of money that is allowed to be deducted based on the whitelist.</param>
+        public static BunqResponse<int> Update(int whitelistSddRecurringId, int? monetaryAccountPayingId = null, Amount maximumAmountPerMonth = 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_MONETARY_ACCOUNT_PAYING_ID, monetaryAccountPayingId},
+    {FIELD_MAXIMUM_AMOUNT_PER_MONTH, maximumAmountPerMonth},
+    };
+    
+            var requestBytes = Encoding.UTF8.GetBytes(BunqJsonConvert.SerializeObject(requestMap));
+            var responseRaw = apiClient.Put(string.Format(ENDPOINT_URL_UPDATE, DetermineUserId(), whitelistSddRecurringId), requestBytes, customHeaders);
+    
+            return ProcessForId(responseRaw);
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static BunqResponse<object> Delete(int whitelistSddRecurringId, 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(), whitelistSddRecurringId), customHeaders);
+    
+            return new BunqResponse<object>(null, responseRaw.Headers);
+        }
+    
+        /// <summary>
+        /// Get a listing of all recurring SDD whitelist entries for a target monetary account.
+        /// </summary>
+        public static BunqResponse<List<WhitelistSddRecurring>> List( 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()), urlParams, customHeaders);
+    
+            return FromJsonList<WhitelistSddRecurring>(responseRaw, OBJECT_TYPE_GET);
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            if (this.Id != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountIncomingId != null)
+            {
+                return false;
+            }
+    
+            if (this.MonetaryAccountPayingId != null)
+            {
+                return false;
+            }
+    
+            if (this.Type != null)
+            {
+                return false;
+            }
+    
+            if (this.Status != null)
+            {
+                return false;
+            }
+    
+            if (this.CreditSchemeIdentifier != null)
+            {
+                return false;
+            }
+    
+            if (this.MandateIdentifier != null)
+            {
+                return false;
+            }
+    
+            if (this.CounterpartyAlias != null)
+            {
+                return false;
+            }
+    
+            if (this.MaximumAmountPerMonth != null)
+            {
+                return false;
+            }
+    
+            if (this.UserAliasCreated != null)
+            {
+                return false;
+            }
+    
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static WhitelistSddRecurring CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<WhitelistSddRecurring>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Object/Address.cs b/BunqSdk/Model/Generated/Object/Address.cs
index 08cec9d..000cbd8 100644
--- a/BunqSdk/Model/Generated/Object/Address.cs
+++ b/BunqSdk/Model/Generated/Object/Address.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,56 +13,56 @@ public class Address : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "street")]
         public string Street { get; set; }
-
+    
         /// <summary>
         /// The house number.
         /// </summary>
         [JsonProperty(PropertyName = "house_number")]
         public string HouseNumber { get; set; }
-
+    
         /// <summary>
         /// The PO box.
         /// </summary>
         [JsonProperty(PropertyName = "po_box")]
         public string PoBox { get; set; }
-
+    
         /// <summary>
         /// The postal code.
         /// </summary>
         [JsonProperty(PropertyName = "postal_code")]
         public string PostalCode { get; set; }
-
+    
         /// <summary>
         /// The city.
         /// </summary>
         [JsonProperty(PropertyName = "city")]
         public string City { get; set; }
-
+    
         /// <summary>
         /// The country as an ISO 3166-1 alpha-2 country code.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// The apartment, building or other extra information for addresses.
         /// </summary>
         [JsonProperty(PropertyName = "extra")]
         public string Extra { get; set; }
-
+    
         /// <summary>
         /// The name on the mailbox (only used for Postal addresses).
         /// </summary>
         [JsonProperty(PropertyName = "mailbox_name")]
         public string MailboxName { get; set; }
-
+    
         /// <summary>
         /// The province according to local standard.
         /// </summary>
         [JsonProperty(PropertyName = "province")]
         public string Province { get; set; }
-
-
+    
+    
         public Address(string street, string houseNumber, string postalCode, string city, string country)
         {
             Street = street;
@@ -70,8 +71,8 @@ public Address(string street, string houseNumber, string postalCode, string city
             City = city;
             Country = country;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -80,55 +81,55 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.HouseNumber != null)
             {
                 return false;
             }
-
+    
             if (this.PoBox != null)
             {
                 return false;
             }
-
+    
             if (this.PostalCode != null)
             {
                 return false;
             }
-
+    
             if (this.City != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             if (this.Province != null)
             {
                 return false;
             }
-
+    
             if (this.Extra != null)
             {
                 return false;
             }
-
+    
             if (this.MailboxName != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Address CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Address>(json);
+            return BunqModel.CreateFromJsonString<Address>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/AllocationItem.cs b/BunqSdk/Model/Generated/Object/AllocationItem.cs
deleted file mode 100644
index 7aedd51..0000000
--- a/BunqSdk/Model/Generated/Object/AllocationItem.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using Bunq.Sdk.Model.Core;
-using Bunq.Sdk.Model.Generated.Endpoint;
-using Newtonsoft.Json;
-
-namespace Bunq.Sdk.Model.Generated.Object
-{
-    /// <summary>
-    /// </summary>
-    public class AllocationItem : BunqModel
-    {
-        /// <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 Amount Amount { get; set; }
-
-        /// <summary>
-        /// The share ratio of the AllocationItem.
-        /// </summary>
-        [JsonProperty(PropertyName = "share_ratio")]
-        public int? ShareRatio { get; set; }
-
-        /// <summary>
-        /// The membership.
-        /// </summary>
-        [JsonProperty(PropertyName = "membership")]
-        public RegistryMembership Membership { get; set; }
-
-
-        public AllocationItem(MonetaryAccountReference alias, string type, Amount amount)
-        {
-            Alias = alias;
-            Type = type;
-            Amount = amount;
-        }
-
-
-        /// <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.ShareRatio != null)
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// </summary>
-        public static AllocationItem CreateFromJsonString(string json)
-        {
-            return CreateFromJsonString<AllocationItem>(json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/BunqSdk/Model/Generated/Object/Amount.cs b/BunqSdk/Model/Generated/Object/Amount.cs
index 9de9ab3..e341231 100644
--- a/BunqSdk/Model/Generated/Object/Amount.cs
+++ b/BunqSdk/Model/Generated/Object/Amount.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,21 +13,21 @@ public class Amount : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public string Value { get; set; }
-
+    
         /// <summary>
         /// The currency of the amount. It is an ISO 4217 formatted currency code.
         /// </summary>
         [JsonProperty(PropertyName = "currency")]
         public string Currency { get; set; }
-
-
+    
+    
         public Amount(string value, string currency)
         {
             Value = value;
             Currency = currency;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -35,20 +36,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Currency != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Amount CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Amount>(json);
+            return BunqModel.CreateFromJsonString<Amount>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Attachment.cs b/BunqSdk/Model/Generated/Object/Attachment.cs
index 6b27be1..99c32c4 100644
--- a/BunqSdk/Model/Generated/Object/Attachment.cs
+++ b/BunqSdk/Model/Generated/Object/Attachment.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class Attachment : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The content type of the attachment's file.
         /// </summary>
         [JsonProperty(PropertyName = "content_type")]
         public string ContentType { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ContentType != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Attachment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Attachment>(json);
+            return BunqModel.CreateFromJsonString<Attachment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/AttachmentMonetaryAccountPayment.cs b/BunqSdk/Model/Generated/Object/AttachmentMonetaryAccountPayment.cs
index 60f566d..f540488 100644
--- a/BunqSdk/Model/Generated/Object/AttachmentMonetaryAccountPayment.cs
+++ b/BunqSdk/Model/Generated/Object/AttachmentMonetaryAccountPayment.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,20 +13,20 @@ public class AttachmentMonetaryAccountPayment : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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 AttachmentMonetaryAccountPayment(int? id)
         {
             Id = id;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -34,20 +35,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentMonetaryAccountPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentMonetaryAccountPayment>(json);
+            return BunqModel.CreateFromJsonString<AttachmentMonetaryAccountPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/AttachmentPublic.cs b/BunqSdk/Model/Generated/Object/AttachmentPublic.cs
index d59b66d..d61290d 100644
--- a/BunqSdk/Model/Generated/Object/AttachmentPublic.cs
+++ b/BunqSdk/Model/Generated/Object/AttachmentPublic.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,20 +13,21 @@ public class AttachmentPublic : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The description of the attachment.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The content type of the attachment's file.
         /// </summary>
         [JsonProperty(PropertyName = "content_type")]
         public string ContentType { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -34,25 +36,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.ContentType != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentPublic CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentPublic>(json);
+            return BunqModel.CreateFromJsonString<AttachmentPublic>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/AttachmentTab.cs b/BunqSdk/Model/Generated/Object/AttachmentTab.cs
index e164af2..b3965d3 100644
--- a/BunqSdk/Model/Generated/Object/AttachmentTab.cs
+++ b/BunqSdk/Model/Generated/Object/AttachmentTab.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,20 +13,21 @@ public class AttachmentTab : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The description of the attachment.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The content type of the attachment's file.
         /// </summary>
         [JsonProperty(PropertyName = "content_type")]
         public string ContentType { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -34,25 +36,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.ContentType != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static AttachmentTab CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<AttachmentTab>(json);
+            return BunqModel.CreateFromJsonString<AttachmentTab>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Avatar.cs b/BunqSdk/Model/Generated/Object/Avatar.cs
index 6886d2a..b31d895 100644
--- a/BunqSdk/Model/Generated/Object/Avatar.cs
+++ b/BunqSdk/Model/Generated/Object/Avatar.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,26 +13,32 @@ public class Avatar : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The public UUID of object this avatar is anchored to.
         /// </summary>
         [JsonProperty(PropertyName = "anchor_uuid")]
         public string AnchorUuid { get; set; }
-
+    
         /// <summary>
         /// The actual image information of this avatar.
         /// </summary>
         [JsonProperty(PropertyName = "image")]
         public List<Image> Image { get; set; }
-
-
+    
+        /// <summary>
+        /// The style (if applicable) for this Avatar.
+        /// </summary>
+        [JsonProperty(PropertyName = "style")]
+        public string Style { get; set; }
+    
+    
         public Avatar(string uuid)
         {
             Uuid = uuid;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -41,25 +47,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.AnchorUuid != null)
             {
                 return false;
             }
-
+    
             if (this.Image != null)
             {
                 return false;
             }
-
+    
+            if (this.Style != null)
+            {
+                return false;
+            }
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Avatar CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Avatar>(json);
+            return BunqModel.CreateFromJsonString<Avatar>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/BudgetRestriction.cs b/BunqSdk/Model/Generated/Object/BudgetRestriction.cs
index b59497f..92347c3 100644
--- a/BunqSdk/Model/Generated/Object/BudgetRestriction.cs
+++ b/BunqSdk/Model/Generated/Object/BudgetRestriction.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class BudgetRestriction : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { get; set; }
-
+    
         /// <summary>
         /// The duration for a budget restriction. Valid values are DAILY, WEEKLY, MONTHLY, YEARLY.
         /// </summary>
         [JsonProperty(PropertyName = "frequency")]
         public string Frequency { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Frequency != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BudgetRestriction CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BudgetRestriction>(json);
+            return BunqModel.CreateFromJsonString<BudgetRestriction>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/BunqId.cs b/BunqSdk/Model/Generated/Object/BunqId.cs
index bf77121..2e6cf9c 100644
--- a/BunqSdk/Model/Generated/Object/BunqId.cs
+++ b/BunqSdk/Model/Generated/Object/BunqId.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,13 +13,13 @@ public class BunqId : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         public BunqId(int? id)
         {
             Id = id;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -27,15 +28,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqId CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqId>(json);
+            return BunqModel.CreateFromJsonString<BunqId>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/BunqMeMerchantAvailable.cs b/BunqSdk/Model/Generated/Object/BunqMeMerchantAvailable.cs
index e410ee7..be475b5 100644
--- a/BunqSdk/Model/Generated/Object/BunqMeMerchantAvailable.cs
+++ b/BunqSdk/Model/Generated/Object/BunqMeMerchantAvailable.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class BunqMeMerchantAvailable : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "merchant_type")]
         public string MerchantType { get; set; }
-
+    
         /// <summary>
         /// Whether or not the merchant is available for the user.
         /// </summary>
         [JsonProperty(PropertyName = "available")]
         public bool? Available { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Available != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static BunqMeMerchantAvailable CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<BunqMeMerchantAvailable>(json);
+            return BunqModel.CreateFromJsonString<BunqMeMerchantAvailable>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/CardBatchEntry.cs b/BunqSdk/Model/Generated/Object/CardBatchEntry.cs
index a35c274..649a7f3 100644
--- a/BunqSdk/Model/Generated/Object/CardBatchEntry.cs
+++ b/BunqSdk/Model/Generated/Object/CardBatchEntry.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,7 +13,7 @@ public class CardBatchEntry : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? 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
@@ -24,51 +24,51 @@ public class CardBatchEntry : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The spending limit for the card.
         /// </summary>
         [JsonProperty(PropertyName = "card_limit")]
         public Amount CardLimit { get; set; }
-
+    
         /// <summary>
         /// The ATM spending limit for the card.
         /// </summary>
         [JsonProperty(PropertyName = "card_limit_atm")]
         public Amount CardLimitAtm { get; set; }
-
+    
         /// <summary>
         /// The countries for which to grant (temporary) permissions to use the card.
         /// </summary>
         [JsonProperty(PropertyName = "country_permission")]
         public List<CardCountryPermission> CountryPermission { get; set; }
-
+    
         /// <summary>
         /// ID of the MA to be used as fallback for this card if insufficient balance. Fallback account is removed if
         /// not supplied.
         /// </summary>
         [JsonProperty(PropertyName = "monetary_account_id_fallback")]
         public int? MonetaryAccountIdFallback { get; set; }
-
-
+    
+    
         public CardBatchEntry(int? id)
         {
             Id = id;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
         {
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardBatchEntry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardBatchEntry>(json);
+            return BunqModel.CreateFromJsonString<CardBatchEntry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/CardBatchReplaceEntry.cs b/BunqSdk/Model/Generated/Object/CardBatchReplaceEntry.cs
new file mode 100644
index 0000000..34858b5
--- /dev/null
+++ b/BunqSdk/Model/Generated/Object/CardBatchReplaceEntry.cs
@@ -0,0 +1,56 @@
+using Bunq.Sdk.Model.Core;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Bunq.Sdk.Model.Generated.Object
+{
+    /// <summary>
+    /// </summary>
+    public class CardBatchReplaceEntry : BunqModel
+    {
+        /// <summary>
+        /// The ID of the card that needs to be replaced.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public int? 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>
+        [JsonProperty(PropertyName = "name_on_card")]
+        public string NameOnCard { get; set; }
+    
+        /// <summary>
+        /// Array of Types, PINs, account IDs assigned to the card.
+        /// </summary>
+        [JsonProperty(PropertyName = "pin_code_assignment")]
+        public List<CardPinAssignment> PinCodeAssignment { get; set; }
+    
+        /// <summary>
+        /// The second line on the card.
+        /// </summary>
+        [JsonProperty(PropertyName = "second_line")]
+        public string SecondLine { get; set; }
+    
+    
+        public CardBatchReplaceEntry(int? id)
+        {
+            Id = id;
+        }
+    
+    
+        /// <summary>
+        /// </summary>
+        public override bool IsAllFieldNull()
+        {
+            return true;
+        }
+    
+        /// <summary>
+        /// </summary>
+        public static CardBatchReplaceEntry CreateFromJsonString(string json)
+        {
+            return BunqModel.CreateFromJsonString<CardBatchReplaceEntry>(json);
+        }
+    }
+}
diff --git a/BunqSdk/Model/Generated/Object/CardCountryPermission.cs b/BunqSdk/Model/Generated/Object/CardCountryPermission.cs
index 4f3a10f..ca1ee97 100644
--- a/BunqSdk/Model/Generated/Object/CardCountryPermission.cs
+++ b/BunqSdk/Model/Generated/Object/CardCountryPermission.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,26 +13,26 @@ public class CardCountryPermission : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// Expiry time of this rule.
         /// </summary>
         [JsonProperty(PropertyName = "expiry_time")]
         public string ExpiryTime { get; set; }
-
+    
         /// <summary>
         /// The id of the card country permission entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
-
+    
+    
         public CardCountryPermission(string country)
         {
             Country = country;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -40,25 +41,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             if (this.ExpiryTime != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardCountryPermission CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardCountryPermission>(json);
+            return BunqModel.CreateFromJsonString<CardCountryPermission>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/CardPinAssignment.cs b/BunqSdk/Model/Generated/Object/CardPinAssignment.cs
index 9c68121..19beb03 100644
--- a/BunqSdk/Model/Generated/Object/CardPinAssignment.cs
+++ b/BunqSdk/Model/Generated/Object/CardPinAssignment.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,26 +13,26 @@ public class CardPinAssignment : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The 4 digit PIN to be assigned to this account.
         /// </summary>
         [JsonProperty(PropertyName = "pin_code")]
         public string PinCode { get; set; }
-
+    
         /// <summary>
         /// 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 CardPinAssignment(string type)
         {
             Type = type;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -40,20 +41,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardPinAssignment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardPinAssignment>(json);
+            return BunqModel.CreateFromJsonString<CardPinAssignment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/CardPrimaryAccountNumber.cs b/BunqSdk/Model/Generated/Object/CardPrimaryAccountNumber.cs
index 05a3fd1..437d2e6 100644
--- a/BunqSdk/Model/Generated/Object/CardPrimaryAccountNumber.cs
+++ b/BunqSdk/Model/Generated/Object/CardPrimaryAccountNumber.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,44 +13,44 @@ public class CardPrimaryAccountNumber : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The description for this PAN.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The status for this PAN, only for Online Cards.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// 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; }
-
+    
         /// <summary>
         /// The UUID for this Virtual PAN.
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The last four digits of the PAN.
         /// </summary>
         [JsonProperty(PropertyName = "four_digit")]
         public string FourDigit { get; set; }
-
-
+    
+    
         public CardPrimaryAccountNumber(int? id)
         {
             Id = id;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -58,40 +59,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Uuid != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccountId != null)
             {
                 return false;
             }
-
+    
             if (this.FourDigit != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CardPrimaryAccountNumber CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CardPrimaryAccountNumber>(json);
+            return BunqModel.CreateFromJsonString<CardPrimaryAccountNumber>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Certificate.cs b/BunqSdk/Model/Generated/Object/Certificate.cs
index daaf26a..84cc32e 100644
--- a/BunqSdk/Model/Generated/Object/Certificate.cs
+++ b/BunqSdk/Model/Generated/Object/Certificate.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,13 +13,13 @@ public class Certificate : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "certificate")]
         public string CertificateString { get; set; }
-
+    
         public Certificate(string certificateString)
         {
             CertificateString = certificateString;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -27,15 +28,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Certificate CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Certificate>(json);
+            return BunqModel.CreateFromJsonString<Certificate>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/CoOwner.cs b/BunqSdk/Model/Generated/Object/CoOwner.cs
index 23caa44..de3c499 100644
--- a/BunqSdk/Model/Generated/Object/CoOwner.cs
+++ b/BunqSdk/Model/Generated/Object/CoOwner.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,13 +13,20 @@ public class CoOwner : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public LabelUser Alias { get; set; }
-
+    
         /// <summary>
         /// Can be: ACCEPTED, REJECTED, PENDING or REVOKED
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
+    
+        public CoOwner(MonetaryAccountReference alias)
+        {
+            Alias = alias;
+        }
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -27,20 +35,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static CoOwner CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<CoOwner>(json);
+            return BunqModel.CreateFromJsonString<CoOwner>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/DraftPaymentAnchorObject.cs b/BunqSdk/Model/Generated/Object/DraftPaymentAnchorObject.cs
index 80e8236..a34b0a0 100644
--- a/BunqSdk/Model/Generated/Object/DraftPaymentAnchorObject.cs
+++ b/BunqSdk/Model/Generated/Object/DraftPaymentAnchorObject.cs
@@ -2,6 +2,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,19 +14,20 @@ public class DraftPaymentAnchorObject : BunqModel, IAnchorObjectInterface
         /// Error constants.
         /// </summary>
         private const string ERROR_NULL_FIELDS = "All fields of an extended model or object are null.";
-
-
+    
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "PaymentBatch")]
         public PaymentBatch PaymentBatch { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -34,15 +36,15 @@ public BunqModel GetReferencedObject()
             {
                 return this.Payment;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return this.PaymentBatch;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -51,20 +53,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static DraftPaymentAnchorObject CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<DraftPaymentAnchorObject>(json);
+            return BunqModel.CreateFromJsonString<DraftPaymentAnchorObject>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/DraftPaymentEntry.cs b/BunqSdk/Model/Generated/Object/DraftPaymentEntry.cs
index dbb8537..af4ed6c 100644
--- a/BunqSdk/Model/Generated/Object/DraftPaymentEntry.cs
+++ b/BunqSdk/Model/Generated/Object/DraftPaymentEntry.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,60 +13,60 @@ public class DraftPaymentEntry : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount containing the public information of the other (counterparty) side of the
         /// DraftPayment.
         /// </summary>
         [JsonProperty(PropertyName = "counterparty_alias")]
         public MonetaryAccountReference CounterpartyAlias { get; set; }
-
+    
         /// <summary>
         /// The description for the DraftPayment. Maximum 140 characters for DraftPayments to external IBANs, 9000
         /// characters for DraftPayments to only other bunq MonetaryAccounts.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// Optional data to be included with the Payment specific to the merchant.
         /// </summary>
         [JsonProperty(PropertyName = "merchant_reference")]
         public string MerchantReference { get; set; }
-
+    
         /// <summary>
         /// The Attachments attached to the DraftPayment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> Attachment { get; set; }
-
+    
         /// <summary>
         /// The id of the draft payment entry.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount containing the public information of 'this' (party) side of the DraftPayment.
         /// </summary>
         [JsonProperty(PropertyName = "alias")]
         public MonetaryAccountReference Alias { get; set; }
-
+    
         /// <summary>
         /// The type of the draft payment entry.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
-
+    
+    
         public DraftPaymentEntry(Amount amount, MonetaryAccountReference counterpartyAlias, string description)
         {
             Amount = amount;
             CounterpartyAlias = counterpartyAlias;
             Description = description;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -75,50 +75,50 @@ public override bool IsAllFieldNull()
             {
                 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.MerchantReference != null)
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static DraftPaymentEntry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<DraftPaymentEntry>(json);
+            return BunqModel.CreateFromJsonString<DraftPaymentEntry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/DraftPaymentResponse.cs b/BunqSdk/Model/Generated/Object/DraftPaymentResponse.cs
index a280cc7..a0dca29 100644
--- a/BunqSdk/Model/Generated/Object/DraftPaymentResponse.cs
+++ b/BunqSdk/Model/Generated/Object/DraftPaymentResponse.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class DraftPaymentResponse : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The user that responded to the DraftPayment.
         /// </summary>
         [JsonProperty(PropertyName = "user_alias_created")]
         public LabelUser UserAliasCreated { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.UserAliasCreated != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static DraftPaymentResponse CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<DraftPaymentResponse>(json);
+            return BunqModel.CreateFromJsonString<DraftPaymentResponse>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/DraftShareInviteEntry.cs b/BunqSdk/Model/Generated/Object/DraftShareInviteEntry.cs
index aaf8173..0a6cf72 100644
--- a/BunqSdk/Model/Generated/Object/DraftShareInviteEntry.cs
+++ b/BunqSdk/Model/Generated/Object/DraftShareInviteEntry.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,26 +13,26 @@ public class DraftShareInviteEntry : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "share_detail")]
         public ShareDetail ShareDetail { get; set; }
-
+    
         /// <summary>
         /// The start date of this share.
         /// </summary>
         [JsonProperty(PropertyName = "start_date")]
         public string StartDate { get; set; }
-
+    
         /// <summary>
         /// The expiration date of this share.
         /// </summary>
         [JsonProperty(PropertyName = "end_date")]
         public string EndDate { get; set; }
-
-
+    
+    
         public DraftShareInviteEntry(ShareDetail shareDetail)
         {
             ShareDetail = shareDetail;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -40,25 +41,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.StartDate != null)
             {
                 return false;
             }
-
+    
             if (this.EndDate != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static DraftShareInviteEntry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<DraftShareInviteEntry>(json);
+            return BunqModel.CreateFromJsonString<DraftShareInviteEntry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Error.cs b/BunqSdk/Model/Generated/Object/Error.cs
index 32a90f4..10708ac 100644
--- a/BunqSdk/Model/Generated/Object/Error.cs
+++ b/BunqSdk/Model/Generated/Object/Error.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class Error : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "error_description")]
         public string ErrorDescription { get; set; }
-
+    
         /// <summary>
         /// The error description (in the user language).
         /// </summary>
         [JsonProperty(PropertyName = "error_description_translated")]
         public string ErrorDescriptionTranslated { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ErrorDescriptionTranslated != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Error CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Error>(json);
+            return BunqModel.CreateFromJsonString<Error>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/EventObject.cs b/BunqSdk/Model/Generated/Object/EventObject.cs
index 1439097..bc9a1ad 100644
--- a/BunqSdk/Model/Generated/Object/EventObject.cs
+++ b/BunqSdk/Model/Generated/Object/EventObject.cs
@@ -2,6 +2,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,149 +14,150 @@ public class EventObject : BunqModel, IAnchorObjectInterface
         /// Error constants.
         /// </summary>
         private const string ERROR_NULL_FIELDS = "All fields of an extended model or object are null.";
-
-
+    
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BunqMeTab")]
         public BunqMeTab BunqMeTab { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BunqMeTabResultResponse")]
         public BunqMeTabResultResponse BunqMeTabResultResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BunqMeFundraiserResult")]
         public BunqMeFundraiserResult BunqMeFundraiserResult { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Card")]
         public Card Card { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "CardDebit")]
         public CardDebit CardDebit { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "DraftPayment")]
         public DraftPayment DraftPayment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "FeatureAnnouncement")]
         public FeatureAnnouncement FeatureAnnouncement { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "IdealMerchantTransaction")]
         public IdealMerchantTransaction IdealMerchantTransaction { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Invoice")]
         public Invoice Invoice { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ScheduledPayment")]
         public SchedulePayment ScheduledPayment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ScheduledPaymentBatch")]
         public SchedulePaymentBatch ScheduledPaymentBatch { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ScheduledInstance")]
         public ScheduleInstance ScheduledInstance { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "MasterCardAction")]
         public MasterCardAction MasterCardAction { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BankSwitchServiceNetherlandsIncomingPayment")]
         public BankSwitchServiceNetherlandsIncomingPayment BankSwitchServiceNetherlandsIncomingPayment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "PaymentBatch")]
         public PaymentBatch PaymentBatch { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RequestInquiryBatch")]
         public RequestInquiryBatch RequestInquiryBatch { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RequestInquiry")]
         public RequestInquiry RequestInquiry { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RequestResponse")]
         public RequestResponse RequestResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RewardRecipient")]
         public RewardRecipient RewardRecipient { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RewardSender")]
         public RewardSender RewardSender { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ShareInviteBankInquiryBatch")]
         public ShareInviteBankInquiryBatch ShareInviteBankInquiryBatch { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ShareInviteBankInquiry")]
         public ShareInviteMonetaryAccountInquiry ShareInviteBankInquiry { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ShareInviteBankResponse")]
         public ShareInviteMonetaryAccountResponse ShareInviteBankResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "SofortMerchantTransaction")]
         public SofortMerchantTransaction SofortMerchantTransaction { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TabResultInquiry")]
         public TabResultInquiry TabResultInquiry { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TabResultResponse")]
         public TabResultResponse TabResultResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TransferwisePayment")]
         public TransferwiseTransfer TransferwisePayment { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -164,145 +166,145 @@ public BunqModel GetReferencedObject()
             {
                 return this.BunqMeTab;
             }
-
+    
             if (this.BunqMeTabResultResponse != null)
             {
                 return this.BunqMeTabResultResponse;
             }
-
+    
             if (this.BunqMeFundraiserResult != null)
             {
                 return this.BunqMeFundraiserResult;
             }
-
+    
             if (this.Card != null)
             {
                 return this.Card;
             }
-
+    
             if (this.CardDebit != null)
             {
                 return this.CardDebit;
             }
-
+    
             if (this.DraftPayment != null)
             {
                 return this.DraftPayment;
             }
-
+    
             if (this.FeatureAnnouncement != null)
             {
                 return this.FeatureAnnouncement;
             }
-
+    
             if (this.IdealMerchantTransaction != null)
             {
                 return this.IdealMerchantTransaction;
             }
-
+    
             if (this.Invoice != null)
             {
                 return this.Invoice;
             }
-
+    
             if (this.ScheduledPayment != null)
             {
                 return this.ScheduledPayment;
             }
-
+    
             if (this.ScheduledPaymentBatch != null)
             {
                 return this.ScheduledPaymentBatch;
             }
-
+    
             if (this.ScheduledInstance != null)
             {
                 return this.ScheduledInstance;
             }
-
+    
             if (this.MasterCardAction != null)
             {
                 return this.MasterCardAction;
             }
-
+    
             if (this.BankSwitchServiceNetherlandsIncomingPayment != null)
             {
                 return this.BankSwitchServiceNetherlandsIncomingPayment;
             }
-
+    
             if (this.Payment != null)
             {
                 return this.Payment;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return this.PaymentBatch;
             }
-
+    
             if (this.RequestInquiryBatch != null)
             {
                 return this.RequestInquiryBatch;
             }
-
+    
             if (this.RequestInquiry != null)
             {
                 return this.RequestInquiry;
             }
-
+    
             if (this.RequestResponse != null)
             {
                 return this.RequestResponse;
             }
-
+    
             if (this.RewardRecipient != null)
             {
                 return this.RewardRecipient;
             }
-
+    
             if (this.RewardSender != null)
             {
                 return this.RewardSender;
             }
-
+    
             if (this.ShareInviteBankInquiryBatch != null)
             {
                 return this.ShareInviteBankInquiryBatch;
             }
-
+    
             if (this.ShareInviteBankInquiry != null)
             {
                 return this.ShareInviteBankInquiry;
             }
-
+    
             if (this.ShareInviteBankResponse != null)
             {
                 return this.ShareInviteBankResponse;
             }
-
+    
             if (this.SofortMerchantTransaction != null)
             {
                 return this.SofortMerchantTransaction;
             }
-
+    
             if (this.TabResultInquiry != null)
             {
                 return this.TabResultInquiry;
             }
-
+    
             if (this.TabResultResponse != null)
             {
                 return this.TabResultResponse;
             }
-
+    
             if (this.TransferwisePayment != null)
             {
                 return this.TransferwisePayment;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -311,150 +313,150 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.BunqMeTabResultResponse != null)
             {
                 return false;
             }
-
+    
             if (this.BunqMeFundraiserResult != null)
             {
                 return false;
             }
-
+    
             if (this.Card != null)
             {
                 return false;
             }
-
+    
             if (this.CardDebit != null)
             {
                 return false;
             }
-
+    
             if (this.DraftPayment != null)
             {
                 return false;
             }
-
+    
             if (this.FeatureAnnouncement != null)
             {
                 return false;
             }
-
+    
             if (this.IdealMerchantTransaction != null)
             {
                 return false;
             }
-
+    
             if (this.Invoice != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduledPayment != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduledPaymentBatch != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduledInstance != null)
             {
                 return false;
             }
-
+    
             if (this.MasterCardAction != null)
             {
                 return false;
             }
-
+    
             if (this.BankSwitchServiceNetherlandsIncomingPayment != null)
             {
                 return false;
             }
-
+    
             if (this.Payment != null)
             {
                 return false;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return false;
             }
-
+    
             if (this.RequestInquiryBatch != null)
             {
                 return false;
             }
-
+    
             if (this.RequestInquiry != null)
             {
                 return false;
             }
-
+    
             if (this.RequestResponse != null)
             {
                 return false;
             }
-
+    
             if (this.RewardRecipient != null)
             {
                 return false;
             }
-
+    
             if (this.RewardSender != null)
             {
                 return false;
             }
-
+    
             if (this.ShareInviteBankInquiryBatch != null)
             {
                 return false;
             }
-
+    
             if (this.ShareInviteBankInquiry != null)
             {
                 return false;
             }
-
+    
             if (this.ShareInviteBankResponse != null)
             {
                 return false;
             }
-
+    
             if (this.SofortMerchantTransaction != null)
             {
                 return false;
             }
-
+    
             if (this.TabResultInquiry != null)
             {
                 return false;
             }
-
+    
             if (this.TabResultResponse != null)
             {
                 return false;
             }
-
+    
             if (this.TransferwisePayment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static EventObject CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<EventObject>(json);
+            return BunqModel.CreateFromJsonString<EventObject>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Geolocation.cs b/BunqSdk/Model/Generated/Object/Geolocation.cs
index 57b40ed..b952910 100644
--- a/BunqSdk/Model/Generated/Object/Geolocation.cs
+++ b/BunqSdk/Model/Generated/Object/Geolocation.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,26 +13,27 @@ public class Geolocation : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "latitude")]
         public double? Latitude { get; set; }
-
+    
         /// <summary>
         /// The longitude for a geolocation restriction.
         /// </summary>
         [JsonProperty(PropertyName = "longitude")]
         public double? Longitude { get; set; }
-
+    
         /// <summary>
         /// The altitude for a geolocation restriction.
         /// </summary>
         [JsonProperty(PropertyName = "altitude")]
         public double? Altitude { get; set; }
-
+    
         /// <summary>
         /// The radius for a geolocation restriction.
         /// </summary>
         [JsonProperty(PropertyName = "radius")]
         public double? Radius { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -40,30 +42,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Longitude != null)
             {
                 return false;
             }
-
+    
             if (this.Altitude != null)
             {
                 return false;
             }
-
+    
             if (this.Radius != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Geolocation CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Geolocation>(json);
+            return BunqModel.CreateFromJsonString<Geolocation>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Image.cs b/BunqSdk/Model/Generated/Object/Image.cs
index fe80a03..90406a6 100644
--- a/BunqSdk/Model/Generated/Object/Image.cs
+++ b/BunqSdk/Model/Generated/Object/Image.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,26 +13,27 @@ public class Image : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "attachment_public_uuid")]
         public string AttachmentPublicUuid { get; set; }
-
+    
         /// <summary>
         /// The content-type as a MIME filetype.
         /// </summary>
         [JsonProperty(PropertyName = "content_type")]
         public string ContentType { get; set; }
-
+    
         /// <summary>
         /// The image height in pixels.
         /// </summary>
         [JsonProperty(PropertyName = "height")]
         public int? Height { get; set; }
-
+    
         /// <summary>
         /// The image width in pixels.
         /// </summary>
         [JsonProperty(PropertyName = "width")]
         public int? Width { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -40,30 +42,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ContentType != null)
             {
                 return false;
             }
-
+    
             if (this.Height != null)
             {
                 return false;
             }
-
+    
             if (this.Width != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Image CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Image>(json);
+            return BunqModel.CreateFromJsonString<Image>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/InvoiceItem.cs b/BunqSdk/Model/Generated/Object/InvoiceItem.cs
index 37a2e1e..4513d7d 100644
--- a/BunqSdk/Model/Generated/Object/InvoiceItem.cs
+++ b/BunqSdk/Model/Generated/Object/InvoiceItem.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,56 +13,57 @@ public class InvoiceItem : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "billing_date")]
         public string BillingDate { get; set; }
-
+    
         /// <summary>
         /// The price description.
         /// </summary>
         [JsonProperty(PropertyName = "type_description")]
         public string TypeDescription { get; set; }
-
+    
         /// <summary>
         /// The translated price description.
         /// </summary>
         [JsonProperty(PropertyName = "type_description_translated")]
         public string TypeDescriptionTranslated { get; set; }
-
+    
         /// <summary>
         /// The unit item price excluding VAT.
         /// </summary>
         [JsonProperty(PropertyName = "unit_vat_exclusive")]
         public Amount UnitVatExclusive { get; set; }
-
+    
         /// <summary>
         /// The unit item price including VAT.
         /// </summary>
         [JsonProperty(PropertyName = "unit_vat_inclusive")]
         public Amount UnitVatInclusive { get; set; }
-
+    
         /// <summary>
         /// The VAT tax fraction.
         /// </summary>
         [JsonProperty(PropertyName = "vat")]
         public double? Vat { get; set; }
-
+    
         /// <summary>
         /// The number of items priced.
         /// </summary>
         [JsonProperty(PropertyName = "quantity")]
         public double? Quantity { get; set; }
-
+    
         /// <summary>
         /// The item price excluding VAT.
         /// </summary>
         [JsonProperty(PropertyName = "total_vat_exclusive")]
         public Amount TotalVatExclusive { get; set; }
-
+    
         /// <summary>
         /// The item price including VAT.
         /// </summary>
         [JsonProperty(PropertyName = "total_vat_inclusive")]
         public Amount TotalVatInclusive { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -70,55 +72,55 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TypeDescription != null)
             {
                 return false;
             }
-
+    
             if (this.TypeDescriptionTranslated != null)
             {
                 return false;
             }
-
+    
             if (this.UnitVatExclusive != null)
             {
                 return false;
             }
-
+    
             if (this.UnitVatInclusive != null)
             {
                 return false;
             }
-
+    
             if (this.Vat != null)
             {
                 return false;
             }
-
+    
             if (this.Quantity != null)
             {
                 return false;
             }
-
+    
             if (this.TotalVatExclusive != null)
             {
                 return false;
             }
-
+    
             if (this.TotalVatInclusive != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static InvoiceItem CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<InvoiceItem>(json);
+            return BunqModel.CreateFromJsonString<InvoiceItem>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/InvoiceItemGroup.cs b/BunqSdk/Model/Generated/Object/InvoiceItemGroup.cs
index 1ef5af4..33aa615 100644
--- a/BunqSdk/Model/Generated/Object/InvoiceItemGroup.cs
+++ b/BunqSdk/Model/Generated/Object/InvoiceItemGroup.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,44 +13,45 @@ public class InvoiceItemGroup : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The description of the type of the invoice item group.
         /// </summary>
         [JsonProperty(PropertyName = "type_description")]
         public string TypeDescription { get; set; }
-
+    
         /// <summary>
         /// The translated description of the type of the invoice item group.
         /// </summary>
         [JsonProperty(PropertyName = "type_description_translated")]
         public string TypeDescriptionTranslated { get; set; }
-
+    
         /// <summary>
         /// The identifier of the invoice item group.
         /// </summary>
         [JsonProperty(PropertyName = "instance_description")]
         public string InstanceDescription { get; set; }
-
+    
         /// <summary>
         /// The unit item price excluding VAT.
         /// </summary>
         [JsonProperty(PropertyName = "product_vat_exclusive")]
         public Amount ProductVatExclusive { get; set; }
-
+    
         /// <summary>
         /// The unit item price including VAT.
         /// </summary>
         [JsonProperty(PropertyName = "product_vat_inclusive")]
         public Amount ProductVatInclusive { get; set; }
-
+    
         /// <summary>
         /// The invoice items in the group.
         /// </summary>
         [JsonProperty(PropertyName = "item")]
         public List<InvoiceItem> Item { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -59,45 +60,45 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TypeDescription != null)
             {
                 return false;
             }
-
+    
             if (this.TypeDescriptionTranslated != null)
             {
                 return false;
             }
-
+    
             if (this.InstanceDescription != null)
             {
                 return false;
             }
-
+    
             if (this.ProductVatExclusive != null)
             {
                 return false;
             }
-
+    
             if (this.ProductVatInclusive != null)
             {
                 return false;
             }
-
+    
             if (this.Item != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static InvoiceItemGroup CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<InvoiceItemGroup>(json);
+            return BunqModel.CreateFromJsonString<InvoiceItemGroup>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Issuer.cs b/BunqSdk/Model/Generated/Object/Issuer.cs
index c3c7408..3986243 100644
--- a/BunqSdk/Model/Generated/Object/Issuer.cs
+++ b/BunqSdk/Model/Generated/Object/Issuer.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,20 +13,20 @@ public class Issuer : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "bic")]
         public string Bic { get; set; }
-
+    
         /// <summary>
         /// The name of the bank.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
-
+    
+    
         public Issuer(string bic)
         {
             Bic = bic;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -34,20 +35,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Name != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Issuer CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Issuer>(json);
+            return BunqModel.CreateFromJsonString<Issuer>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/LabelCard.cs b/BunqSdk/Model/Generated/Object/LabelCard.cs
index fdf02b1..a65b9af 100644
--- a/BunqSdk/Model/Generated/Object/LabelCard.cs
+++ b/BunqSdk/Model/Generated/Object/LabelCard.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,38 +13,39 @@ public class LabelCard : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The type of the card.
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The second line on the card.
         /// </summary>
         [JsonProperty(PropertyName = "second_line")]
         public string SecondLine { get; set; }
-
+    
         /// <summary>
         /// The date this card will expire.
         /// </summary>
         [JsonProperty(PropertyName = "expiry_date")]
         public string ExpiryDate { get; set; }
-
+    
         /// <summary>
         /// The status of the card.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The owner of this card.
         /// </summary>
         [JsonProperty(PropertyName = "label_user")]
         public LabelUser LabelUser { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -52,40 +54,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.SecondLine != null)
             {
                 return false;
             }
-
+    
             if (this.ExpiryDate != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             if (this.LabelUser != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static LabelCard CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<LabelCard>(json);
+            return BunqModel.CreateFromJsonString<LabelCard>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/LabelMonetaryAccount.cs b/BunqSdk/Model/Generated/Object/LabelMonetaryAccount.cs
index 388fb33..e5ecce9 100644
--- a/BunqSdk/Model/Generated/Object/LabelMonetaryAccount.cs
+++ b/BunqSdk/Model/Generated/Object/LabelMonetaryAccount.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,74 +13,75 @@ public class LabelMonetaryAccount : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "iban")]
         public string Iban { get; set; }
-
+    
         /// <summary>
         /// The name to display with this monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "display_name")]
         public string DisplayName { get; set; }
-
+    
         /// <summary>
         /// The avatar of the monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The user this monetary account belongs to.
         /// </summary>
         [JsonProperty(PropertyName = "label_user")]
         public LabelUser LabelUser { get; set; }
-
+    
         /// <summary>
         /// The country of the user. Formatted as a ISO 3166-1 alpha-2 country code.
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// Bunq.me pointer with type and value.
         /// </summary>
         [JsonProperty(PropertyName = "bunq_me")]
         public MonetaryAccountReference BunqMe { get; set; }
-
+    
         /// <summary>
         /// Whether or not the monetary account is light.
         /// </summary>
         [JsonProperty(PropertyName = "is_light")]
         public bool? IsLight { get; set; }
-
+    
         /// <summary>
         /// The BIC used for a SWIFT payment.
         /// </summary>
         [JsonProperty(PropertyName = "swift_bic")]
         public string SwiftBic { get; set; }
-
+    
         /// <summary>
         /// The account number used for a SWIFT payment. May or may not be an IBAN.
         /// </summary>
         [JsonProperty(PropertyName = "swift_account_number")]
         public string SwiftAccountNumber { get; set; }
-
+    
         /// <summary>
         /// The account number used for a Transferwise payment. May or may not be an IBAN.
         /// </summary>
         [JsonProperty(PropertyName = "transferwise_account_number")]
         public string TransferwiseAccountNumber { get; set; }
-
+    
         /// <summary>
         /// The bank code used for a Transferwise payment. May or may not be a BIC.
         /// </summary>
         [JsonProperty(PropertyName = "transferwise_bank_code")]
         public string TransferwiseBankCode { get; set; }
-
+    
         /// <summary>
         /// The merchant category code.
         /// </summary>
         [JsonProperty(PropertyName = "merchant_category_code")]
         public string MerchantCategoryCode { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -88,70 +90,70 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.DisplayName != null)
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.LabelUser != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             if (this.BunqMe != null)
             {
                 return false;
             }
-
+    
             if (this.IsLight != null)
             {
                 return false;
             }
-
+    
             if (this.SwiftBic != null)
             {
                 return false;
             }
-
+    
             if (this.SwiftAccountNumber != null)
             {
                 return false;
             }
-
+    
             if (this.TransferwiseAccountNumber != null)
             {
                 return false;
             }
-
+    
             if (this.TransferwiseBankCode != null)
             {
                 return false;
             }
-
+    
             if (this.MerchantCategoryCode != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static LabelMonetaryAccount CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<LabelMonetaryAccount>(json);
+            return BunqModel.CreateFromJsonString<LabelMonetaryAccount>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/LabelUser.cs b/BunqSdk/Model/Generated/Object/LabelUser.cs
index 26ef5d6..3b9a049 100644
--- a/BunqSdk/Model/Generated/Object/LabelUser.cs
+++ b/BunqSdk/Model/Generated/Object/LabelUser.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,40 +13,40 @@ public class LabelUser : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "uuid")]
         public string Uuid { get; set; }
-
+    
         /// <summary>
         /// The name to be displayed for this user, as it was given on the request.
         /// </summary>
         [JsonProperty(PropertyName = "display_name")]
         public string DisplayName { get; set; }
-
+    
         /// <summary>
         /// The country of the user. 000 stands for "unknown"
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// The current avatar of the user.
         /// </summary>
         [JsonProperty(PropertyName = "avatar")]
         public Avatar Avatar { get; set; }
-
+    
         /// <summary>
         /// The current nickname of the user.
         /// </summary>
         [JsonProperty(PropertyName = "public_nick_name")]
         public string PublicNickName { get; set; }
-
-
+    
+    
         public LabelUser(string uuid, string displayName, string country)
         {
             Uuid = uuid;
             DisplayName = displayName;
             Country = country;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -54,35 +55,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Avatar != null)
             {
                 return false;
             }
-
+    
             if (this.PublicNickName != null)
             {
                 return false;
             }
-
+    
             if (this.DisplayName != null)
             {
                 return false;
             }
-
+    
             if (this.Country != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static LabelUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<LabelUser>(json);
+            return BunqModel.CreateFromJsonString<LabelUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/MonetaryAccountProfileDrain.cs b/BunqSdk/Model/Generated/Object/MonetaryAccountProfileDrain.cs
index 3c305ad..075d7a6 100644
--- a/BunqSdk/Model/Generated/Object/MonetaryAccountProfileDrain.cs
+++ b/BunqSdk/Model/Generated/Object/MonetaryAccountProfileDrain.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,36 +13,35 @@ public class MonetaryAccountProfileDrain : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The goal balance.
         /// </summary>
         [JsonProperty(PropertyName = "balance_preferred")]
         public Amount BalancePreferred { get; set; }
-
+    
         /// <summary>
         /// The high threshold balance.
         /// </summary>
         [JsonProperty(PropertyName = "balance_threshold_high")]
         public Amount BalanceThresholdHigh { get; set; }
-
+    
         /// <summary>
         /// The savings monetary account.
         /// </summary>
         [JsonProperty(PropertyName = "savings_account_alias")]
         public MonetaryAccountReference SavingsAccountAlias { get; set; }
-
-
-        public MonetaryAccountProfileDrain(string status, Amount balancePreferred, Amount balanceThresholdHigh,
-            MonetaryAccountReference savingsAccountAlias)
+    
+    
+        public MonetaryAccountProfileDrain(string status, Amount balancePreferred, Amount balanceThresholdHigh, MonetaryAccountReference savingsAccountAlias)
         {
             Status = status;
             BalancePreferred = balancePreferred;
             BalanceThresholdHigh = balanceThresholdHigh;
             SavingsAccountAlias = savingsAccountAlias;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -50,30 +50,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.BalancePreferred != null)
             {
                 return false;
             }
-
+    
             if (this.BalanceThresholdHigh != null)
             {
                 return false;
             }
-
+    
             if (this.SavingsAccountAlias != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccountProfileDrain CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccountProfileDrain>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccountProfileDrain>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/MonetaryAccountProfileFill.cs b/BunqSdk/Model/Generated/Object/MonetaryAccountProfileFill.cs
index e703f6b..16168ad 100644
--- a/BunqSdk/Model/Generated/Object/MonetaryAccountProfileFill.cs
+++ b/BunqSdk/Model/Generated/Object/MonetaryAccountProfileFill.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,42 +13,40 @@ public class MonetaryAccountProfileFill : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
+    
         /// <summary>
         /// The goal balance.
         /// </summary>
         [JsonProperty(PropertyName = "balance_preferred")]
         public Amount BalancePreferred { get; set; }
-
+    
         /// <summary>
         /// The low threshold balance.
         /// </summary>
         [JsonProperty(PropertyName = "balance_threshold_low")]
         public Amount BalanceThresholdLow { get; set; }
-
+    
         /// <summary>
         /// The method used to fill the monetary account. Currently only iDEAL is supported, and it is the default one.
         /// </summary>
         [JsonProperty(PropertyName = "method_fill")]
         public string MethodFill { get; set; }
-
+    
         /// <summary>
         /// The bank the fill is supposed to happen from, with BIC and bank name.
         /// </summary>
         [JsonProperty(PropertyName = "issuer")]
         public Issuer Issuer { get; set; }
-
-
-        public MonetaryAccountProfileFill(string status, Amount balancePreferred, Amount balanceThresholdLow,
-            string methodFill)
+    
+    
+        public MonetaryAccountProfileFill(string status, Amount balancePreferred, Amount balanceThresholdLow)
         {
             Status = status;
             BalancePreferred = balancePreferred;
             BalanceThresholdLow = balanceThresholdLow;
-            MethodFill = methodFill;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -56,35 +55,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.BalancePreferred != null)
             {
                 return false;
             }
-
+    
             if (this.BalanceThresholdLow != null)
             {
                 return false;
             }
-
+    
             if (this.MethodFill != null)
             {
                 return false;
             }
-
+    
             if (this.Issuer != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccountProfileFill CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccountProfileFill>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccountProfileFill>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/MonetaryAccountSetting.cs b/BunqSdk/Model/Generated/Object/MonetaryAccountSetting.cs
index 6eb6c1e..85542cf 100644
--- a/BunqSdk/Model/Generated/Object/MonetaryAccountSetting.cs
+++ b/BunqSdk/Model/Generated/Object/MonetaryAccountSetting.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,26 +13,33 @@ public class MonetaryAccountSetting : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "color")]
         public string Color { get; set; }
-
+    
         /// <summary>
         /// The icon chosen for the MonetaryAccount.
         /// </summary>
         [JsonProperty(PropertyName = "icon")]
         public string Icon { get; set; }
-
+    
         /// <summary>
         /// The status of the avatar. Can be either AVATAR_DEFAULT, AVATAR_CUSTOM or AVATAR_UNDETERMINED.
         /// </summary>
         [JsonProperty(PropertyName = "default_avatar_status")]
         public string DefaultAvatarStatus { get; set; }
-
+    
         /// <summary>
         /// The chat restriction. Possible values are ALLOW_INCOMING or BLOCK_INCOMING
         /// </summary>
         [JsonProperty(PropertyName = "restriction_chat")]
         public string RestrictionChat { get; set; }
-
-
+    
+        /// <summary>
+        /// The preference for this monetary account on whether to automatically accept or reject expiring SDDs.
+        /// </summary>
+        [JsonProperty(PropertyName = "sdd_expiration_action")]
+        public string SddExpirationAction { get; set; }
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -40,30 +48,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Icon != null)
             {
                 return false;
             }
-
+    
             if (this.DefaultAvatarStatus != null)
             {
                 return false;
             }
-
+    
             if (this.RestrictionChat != null)
             {
                 return false;
             }
-
+    
+            if (this.SddExpirationAction != null)
+            {
+                return false;
+            }
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static MonetaryAccountSetting CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<MonetaryAccountSetting>(json);
+            return BunqModel.CreateFromJsonString<MonetaryAccountSetting>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/NotificationAnchorObject.cs b/BunqSdk/Model/Generated/Object/NotificationAnchorObject.cs
index de367cb..047f067 100644
--- a/BunqSdk/Model/Generated/Object/NotificationAnchorObject.cs
+++ b/BunqSdk/Model/Generated/Object/NotificationAnchorObject.cs
@@ -2,6 +2,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,119 +14,120 @@ public class NotificationAnchorObject : BunqModel, IAnchorObjectInterface
         /// Error constants.
         /// </summary>
         private const string ERROR_NULL_FIELDS = "All fields of an extended model or object are null.";
-
-
+    
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BunqMeFundraiserResult")]
         public BunqMeFundraiserResult BunqMeFundraiserResult { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BunqMeTab")]
         public BunqMeTab BunqMeTab { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BunqMeTabResultInquiry")]
         public BunqMeTabResultInquiry BunqMeTabResultInquiry { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BunqMeTabResultResponse")]
         public BunqMeTabResultResponse BunqMeTabResultResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ChatMessage")]
         public ChatMessage ChatMessage { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "DraftPayment")]
         public DraftPayment DraftPayment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "IdealMerchantTransaction")]
         public IdealMerchantTransaction IdealMerchantTransaction { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Invoice")]
         public Invoice Invoice { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "MasterCardAction")]
         public MasterCardAction MasterCardAction { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "MonetaryAccount")]
         public MonetaryAccount MonetaryAccount { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "PaymentBatch")]
         public PaymentBatch PaymentBatch { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RequestInquiry")]
         public RequestInquiry RequestInquiry { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RequestInquiryBatch")]
         public RequestInquiryBatch RequestInquiryBatch { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RequestResponse")]
         public RequestResponse RequestResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ShareInviteBankInquiry")]
         public ShareInviteMonetaryAccountInquiry ShareInviteBankInquiry { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ShareInviteBankResponse")]
         public ShareInviteMonetaryAccountResponse ShareInviteBankResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ScheduledPayment")]
         public SchedulePayment ScheduledPayment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ScheduledInstance")]
         public ScheduleInstance ScheduledInstance { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TabResultInquiry")]
         public TabResultInquiry TabResultInquiry { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TabResultResponse")]
         public TabResultResponse TabResultResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "User")]
         public User User { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -134,115 +136,115 @@ public BunqModel GetReferencedObject()
             {
                 return this.BunqMeFundraiserResult;
             }
-
+    
             if (this.BunqMeTab != null)
             {
                 return this.BunqMeTab;
             }
-
+    
             if (this.BunqMeTabResultInquiry != null)
             {
                 return this.BunqMeTabResultInquiry;
             }
-
+    
             if (this.BunqMeTabResultResponse != null)
             {
                 return this.BunqMeTabResultResponse;
             }
-
+    
             if (this.ChatMessage != null)
             {
                 return this.ChatMessage;
             }
-
+    
             if (this.DraftPayment != null)
             {
                 return this.DraftPayment;
             }
-
+    
             if (this.IdealMerchantTransaction != null)
             {
                 return this.IdealMerchantTransaction;
             }
-
+    
             if (this.Invoice != null)
             {
                 return this.Invoice;
             }
-
+    
             if (this.MasterCardAction != null)
             {
                 return this.MasterCardAction;
             }
-
+    
             if (this.MonetaryAccount != null)
             {
                 return this.MonetaryAccount;
             }
-
+    
             if (this.Payment != null)
             {
                 return this.Payment;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return this.PaymentBatch;
             }
-
+    
             if (this.RequestInquiry != null)
             {
                 return this.RequestInquiry;
             }
-
+    
             if (this.RequestInquiryBatch != null)
             {
                 return this.RequestInquiryBatch;
             }
-
+    
             if (this.RequestResponse != null)
             {
                 return this.RequestResponse;
             }
-
+    
             if (this.ShareInviteBankInquiry != null)
             {
                 return this.ShareInviteBankInquiry;
             }
-
+    
             if (this.ShareInviteBankResponse != null)
             {
                 return this.ShareInviteBankResponse;
             }
-
+    
             if (this.ScheduledPayment != null)
             {
                 return this.ScheduledPayment;
             }
-
+    
             if (this.ScheduledInstance != null)
             {
                 return this.ScheduledInstance;
             }
-
+    
             if (this.TabResultInquiry != null)
             {
                 return this.TabResultInquiry;
             }
-
+    
             if (this.TabResultResponse != null)
             {
                 return this.TabResultResponse;
             }
-
+    
             if (this.User != null)
             {
                 return this.User;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -251,120 +253,120 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.BunqMeTab != null)
             {
                 return false;
             }
-
+    
             if (this.BunqMeTabResultInquiry != null)
             {
                 return false;
             }
-
+    
             if (this.BunqMeTabResultResponse != null)
             {
                 return false;
             }
-
+    
             if (this.ChatMessage != null)
             {
                 return false;
             }
-
+    
             if (this.DraftPayment != null)
             {
                 return false;
             }
-
+    
             if (this.IdealMerchantTransaction != null)
             {
                 return false;
             }
-
+    
             if (this.Invoice != null)
             {
                 return false;
             }
-
+    
             if (this.MasterCardAction != null)
             {
                 return false;
             }
-
+    
             if (this.MonetaryAccount != null)
             {
                 return false;
             }
-
+    
             if (this.Payment != null)
             {
                 return false;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return false;
             }
-
+    
             if (this.RequestInquiry != null)
             {
                 return false;
             }
-
+    
             if (this.RequestInquiryBatch != null)
             {
                 return false;
             }
-
+    
             if (this.RequestResponse != null)
             {
                 return false;
             }
-
+    
             if (this.ShareInviteBankInquiry != null)
             {
                 return false;
             }
-
+    
             if (this.ShareInviteBankResponse != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduledPayment != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduledInstance != null)
             {
                 return false;
             }
-
+    
             if (this.TabResultInquiry != null)
             {
                 return false;
             }
-
+    
             if (this.TabResultResponse != null)
             {
                 return false;
             }
-
+    
             if (this.User != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static NotificationAnchorObject CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NotificationAnchorObject>(json);
+            return BunqModel.CreateFromJsonString<NotificationAnchorObject>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/NotificationFilter.cs b/BunqSdk/Model/Generated/Object/NotificationFilter.cs
index 9e7fd76..29f65fe 100644
--- a/BunqSdk/Model/Generated/Object/NotificationFilter.cs
+++ b/BunqSdk/Model/Generated/Object/NotificationFilter.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,14 +14,14 @@ public class NotificationFilter : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "notification_delivery_method")]
         public string NotificationDeliveryMethod { get; set; }
-
+    
         /// <summary>
         /// The target of notifications that match this notification filter. For URL notification filters this is the
         /// URL to which the callback will be made. For PUSH notifications filters this should always be null.
         /// </summary>
         [JsonProperty(PropertyName = "notification_target")]
         public string NotificationTarget { get; set; }
-
+    
         /// <summary>
         /// The notification category that will match this notification filter. Possible choices are BILLING,
         /// CARD_TRANSACTION_FAILED, CARD_TRANSACTION_SUCCESSFUL, CHAT, DRAFT_PAYMENT, IDEAL, SOFORT,
@@ -29,16 +30,16 @@ public class NotificationFilter : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "category")]
         public string Category { get; set; }
-
-
+    
+    
         public NotificationFilter(string notificationDeliveryMethod, string notificationTarget, string category)
         {
             NotificationDeliveryMethod = notificationDeliveryMethod;
             NotificationTarget = notificationTarget;
             Category = category;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -47,25 +48,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.NotificationTarget != null)
             {
                 return false;
             }
-
+    
             if (this.Category != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static NotificationFilter CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NotificationFilter>(json);
+            return BunqModel.CreateFromJsonString<NotificationFilter>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/NotificationFilterPush.cs b/BunqSdk/Model/Generated/Object/NotificationFilterPush.cs
index deaf4e5..06b3e91 100644
--- a/BunqSdk/Model/Generated/Object/NotificationFilterPush.cs
+++ b/BunqSdk/Model/Generated/Object/NotificationFilterPush.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,13 +13,13 @@ public class NotificationFilterPush : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "category")]
         public string Category { get; set; }
-
+    
         public NotificationFilterPush(string category)
         {
             Category = category;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -27,15 +28,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static NotificationFilterPush CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NotificationFilterPush>(json);
+            return BunqModel.CreateFromJsonString<NotificationFilterPush>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/NotificationFilterUrl.cs b/BunqSdk/Model/Generated/Object/NotificationFilterUrl.cs
index 9e5ab1d..af490e8 100644
--- a/BunqSdk/Model/Generated/Object/NotificationFilterUrl.cs
+++ b/BunqSdk/Model/Generated/Object/NotificationFilterUrl.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,39 +13,39 @@ public class NotificationFilterUrl : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "category")]
         public string Category { get; set; }
-
+    
         /// <summary>
         /// The URL to which the callback should be made.
         /// </summary>
         [JsonProperty(PropertyName = "notification_target")]
         public string NotificationTarget { get; set; }
-
+    
         /// <summary>
         /// The id of the NotificationFilterUrl.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the NotificationFilterUrl's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the NotificationFilterUrl's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
-
+    
+    
         public NotificationFilterUrl(string category, string notificationTarget)
         {
             Category = category;
             NotificationTarget = notificationTarget;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -53,35 +54,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Category != null)
             {
                 return false;
             }
-
+    
             if (this.NotificationTarget != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static NotificationFilterUrl CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NotificationFilterUrl>(json);
+            return BunqModel.CreateFromJsonString<NotificationFilterUrl>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/NotificationUrl.cs b/BunqSdk/Model/Generated/Object/NotificationUrl.cs
index 1b3bab9..96ba264 100644
--- a/BunqSdk/Model/Generated/Object/NotificationUrl.cs
+++ b/BunqSdk/Model/Generated/Object/NotificationUrl.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -11,23 +12,24 @@ public class NotificationUrl : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "target_url")]
         public string TargetUrl { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "category")]
         public string Category { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "event_type")]
         public string EventType { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "object")]
         public NotificationAnchorObject Object { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -36,30 +38,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Category != null)
             {
                 return false;
             }
-
+    
             if (this.EventType != null)
             {
                 return false;
             }
-
+    
             if (this.Object != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static NotificationUrl CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<NotificationUrl>(json);
+            return BunqModel.CreateFromJsonString<NotificationUrl>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/OauthCallbackUrl.cs b/BunqSdk/Model/Generated/Object/OauthCallbackUrl.cs
index d8c347b..d617399 100644
--- a/BunqSdk/Model/Generated/Object/OauthCallbackUrl.cs
+++ b/BunqSdk/Model/Generated/Object/OauthCallbackUrl.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,26 +13,27 @@ public class OauthCallbackUrl : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the callback URL's creation.
         /// </summary>
         [JsonProperty(PropertyName = "created")]
         public string Created { get; set; }
-
+    
         /// <summary>
         /// The timestamp of the callback URL's last update.
         /// </summary>
         [JsonProperty(PropertyName = "updated")]
         public string Updated { get; set; }
-
+    
         /// <summary>
         /// The Callback URL.
         /// </summary>
         [JsonProperty(PropertyName = "url")]
         public string Url { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -40,30 +42,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Created != null)
             {
                 return false;
             }
-
+    
             if (this.Updated != null)
             {
                 return false;
             }
-
+    
             if (this.Url != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static OauthCallbackUrl CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<OauthCallbackUrl>(json);
+            return BunqModel.CreateFromJsonString<OauthCallbackUrl>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/PaymentBatchAnchoredPayment.cs b/BunqSdk/Model/Generated/Object/PaymentBatchAnchoredPayment.cs
index 5326a9e..2358ca8 100644
--- a/BunqSdk/Model/Generated/Object/PaymentBatchAnchoredPayment.cs
+++ b/BunqSdk/Model/Generated/Object/PaymentBatchAnchoredPayment.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,8 +13,8 @@ public class PaymentBatchAnchoredPayment : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "Payment")]
         public List<Payment> Payment { get; set; }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -23,15 +23,15 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PaymentBatchAnchoredPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PaymentBatchAnchoredPayment>(json);
+            return BunqModel.CreateFromJsonString<PaymentBatchAnchoredPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/PermittedDevice.cs b/BunqSdk/Model/Generated/Object/PermittedDevice.cs
index 91a78ac..a890884 100644
--- a/BunqSdk/Model/Generated/Object/PermittedDevice.cs
+++ b/BunqSdk/Model/Generated/Object/PermittedDevice.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class PermittedDevice : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The IP address of the device that may use the credential.
         /// </summary>
         [JsonProperty(PropertyName = "ip")]
         public string Ip { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Ip != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static PermittedDevice CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<PermittedDevice>(json);
+            return BunqModel.CreateFromJsonString<PermittedDevice>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Pointer.cs b/BunqSdk/Model/Generated/Object/Pointer.cs
index 2530a18..3e57f4c 100644
--- a/BunqSdk/Model/Generated/Object/Pointer.cs
+++ b/BunqSdk/Model/Generated/Object/Pointer.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,27 +13,33 @@ public class Pointer : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The alias value.
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public string Value { get; set; }
-
+    
         /// <summary>
         /// The alias name.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
-
+    
+        /// <summary>
+        /// The pointer service. Only required for external counterparties.
+        /// </summary>
+        [JsonProperty(PropertyName = "service")]
+        public string Service { get; set; }
+    
+    
         public Pointer(string type, string value)
         {
             Type = type;
             Value = value;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -41,25 +48,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Value != null)
             {
                 return false;
             }
-
+    
             if (this.Name != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Pointer CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Pointer>(json);
+            return BunqModel.CreateFromJsonString<Pointer>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/RegistryEntryAttachment.cs b/BunqSdk/Model/Generated/Object/RegistryEntryAttachment.cs
deleted file mode 100644
index f9328b6..0000000
--- a/BunqSdk/Model/Generated/Object/RegistryEntryAttachment.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using Bunq.Sdk.Model.Core;
-using Newtonsoft.Json;
-
-namespace Bunq.Sdk.Model.Generated.Object
-{
-    /// <summary>
-    /// </summary>
-    public class RegistryEntryAttachment : BunqModel
-    {
-        /// <summary>
-        /// The id of the attachment.
-        /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public int? Id { get; set; }
-
-        /// <summary>
-        /// The id of the monetary account to which the attachment belongs.
-        /// </summary>
-        [JsonProperty(PropertyName = "monetary_account_id")]
-        public int? MonetaryAccountId { get; set; }
-
-
-        public RegistryEntryAttachment(int? 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 RegistryEntryAttachment CreateFromJsonString(string json)
-        {
-            return CreateFromJsonString<RegistryEntryAttachment>(json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/BunqSdk/Model/Generated/Object/RegistryEntryReference.cs b/BunqSdk/Model/Generated/Object/RegistryEntryReference.cs
deleted file mode 100644
index 283f2eb..0000000
--- a/BunqSdk/Model/Generated/Object/RegistryEntryReference.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Bunq.Sdk.Model.Core;
-using Newtonsoft.Json;
-
-namespace Bunq.Sdk.Model.Generated.Object
-{
-    /// <summary>
-    /// </summary>
-    public class RegistryEntryReference : 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 int? Id { get; set; }
-
-
-        /// <summary>
-        /// </summary>
-        public override bool IsAllFieldNull()
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// </summary>
-        public static RegistryEntryReference CreateFromJsonString(string json)
-        {
-            return CreateFromJsonString<RegistryEntryReference>(json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/BunqSdk/Model/Generated/Object/RegistrySettlementItem.cs b/BunqSdk/Model/Generated/Object/RegistrySettlementItem.cs
index 6f5370a..d6d9b99 100644
--- a/BunqSdk/Model/Generated/Object/RegistrySettlementItem.cs
+++ b/BunqSdk/Model/Generated/Object/RegistrySettlementItem.cs
@@ -1,6 +1,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,32 +14,33 @@ public class RegistrySettlementItem : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { get; set; }
-
+    
         /// <summary>
         /// The membership of the user that has to pay.
         /// </summary>
         [JsonProperty(PropertyName = "membership_paying")]
         public RegistryMembership MembershipPaying { get; set; }
-
+    
         /// <summary>
         /// The membership of the user that will receive money.
         /// </summary>
         [JsonProperty(PropertyName = "membership_receiving")]
         public RegistryMembership MembershipReceiving { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount of the user that has to pay the request.
         /// </summary>
         [JsonProperty(PropertyName = "paying_user_alias")]
         public MonetaryAccountReference PayingUserAlias { get; set; }
-
+    
         /// <summary>
         /// The LabelMonetaryAccount of the user that will receive the amount.
         /// </summary>
         [JsonProperty(PropertyName = "receiving_user_alias")]
         public MonetaryAccountReference ReceivingUserAlias { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -47,35 +49,35 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MembershipPaying != null)
             {
                 return false;
             }
-
+    
             if (this.MembershipReceiving != null)
             {
                 return false;
             }
-
+    
             if (this.PayingUserAlias != null)
             {
                 return false;
             }
-
+    
             if (this.ReceivingUserAlias != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RegistrySettlementItem CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RegistrySettlementItem>(json);
+            return BunqModel.CreateFromJsonString<RegistrySettlementItem>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/RequestInquiryReference.cs b/BunqSdk/Model/Generated/Object/RequestInquiryReference.cs
index 2acb9b7..64fe654 100644
--- a/BunqSdk/Model/Generated/Object/RequestInquiryReference.cs
+++ b/BunqSdk/Model/Generated/Object/RequestInquiryReference.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class RequestInquiryReference : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The id of the request inquiry (batch).
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Id != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RequestInquiryReference CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RequestInquiryReference>(json);
+            return BunqModel.CreateFromJsonString<RequestInquiryReference>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/RequestReferenceSplitTheBillAnchorObject.cs b/BunqSdk/Model/Generated/Object/RequestReferenceSplitTheBillAnchorObject.cs
index 73ee634..af505c6 100644
--- a/BunqSdk/Model/Generated/Object/RequestReferenceSplitTheBillAnchorObject.cs
+++ b/BunqSdk/Model/Generated/Object/RequestReferenceSplitTheBillAnchorObject.cs
@@ -2,6 +2,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,59 +14,60 @@ public class RequestReferenceSplitTheBillAnchorObject : BunqModel, IAnchorObject
         /// Error constants.
         /// </summary>
         private const string ERROR_NULL_FIELDS = "All fields of an extended model or object are null.";
-
-
+    
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "BillingInvoice")]
         public Invoice BillingInvoice { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "DraftPayment")]
         public DraftPayment DraftPayment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "MasterCardAction")]
         public MasterCardAction MasterCardAction { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "PaymentBatch")]
         public PaymentBatch PaymentBatch { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "RequestResponse")]
         public RequestResponse RequestResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "ScheduleInstance")]
         public ScheduleInstance ScheduleInstance { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TabResultResponse")]
         public TabResultResponse TabResultResponse { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "WhitelistResult")]
         public WhitelistResult WhitelistResult { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "TransferwisePayment")]
         public TransferwiseTransfer TransferwisePayment { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -74,55 +76,55 @@ public BunqModel GetReferencedObject()
             {
                 return this.BillingInvoice;
             }
-
+    
             if (this.DraftPayment != null)
             {
                 return this.DraftPayment;
             }
-
+    
             if (this.MasterCardAction != null)
             {
                 return this.MasterCardAction;
             }
-
+    
             if (this.Payment != null)
             {
                 return this.Payment;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return this.PaymentBatch;
             }
-
+    
             if (this.RequestResponse != null)
             {
                 return this.RequestResponse;
             }
-
+    
             if (this.ScheduleInstance != null)
             {
                 return this.ScheduleInstance;
             }
-
+    
             if (this.TabResultResponse != null)
             {
                 return this.TabResultResponse;
             }
-
+    
             if (this.WhitelistResult != null)
             {
                 return this.WhitelistResult;
             }
-
+    
             if (this.TransferwisePayment != null)
             {
                 return this.TransferwisePayment;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -131,60 +133,60 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.DraftPayment != null)
             {
                 return false;
             }
-
+    
             if (this.MasterCardAction != null)
             {
                 return false;
             }
-
+    
             if (this.Payment != null)
             {
                 return false;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return false;
             }
-
+    
             if (this.RequestResponse != null)
             {
                 return false;
             }
-
+    
             if (this.ScheduleInstance != null)
             {
                 return false;
             }
-
+    
             if (this.TabResultResponse != null)
             {
                 return false;
             }
-
+    
             if (this.WhitelistResult != null)
             {
                 return false;
             }
-
+    
             if (this.TransferwisePayment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static RequestReferenceSplitTheBillAnchorObject CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<RequestReferenceSplitTheBillAnchorObject>(json);
+            return BunqModel.CreateFromJsonString<RequestReferenceSplitTheBillAnchorObject>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/ScheduleAnchorObject.cs b/BunqSdk/Model/Generated/Object/ScheduleAnchorObject.cs
index 4584d90..d31e8c6 100644
--- a/BunqSdk/Model/Generated/Object/ScheduleAnchorObject.cs
+++ b/BunqSdk/Model/Generated/Object/ScheduleAnchorObject.cs
@@ -2,6 +2,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,19 +14,20 @@ public class ScheduleAnchorObject : BunqModel, IAnchorObjectInterface
         /// Error constants.
         /// </summary>
         private const string ERROR_NULL_FIELDS = "All fields of an extended model or object are null.";
-
-
+    
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "PaymentBatch")]
         public PaymentBatch PaymentBatch { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -34,15 +36,15 @@ public BunqModel GetReferencedObject()
             {
                 return this.Payment;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return this.PaymentBatch;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -51,20 +53,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ScheduleAnchorObject CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ScheduleAnchorObject>(json);
+            return BunqModel.CreateFromJsonString<ScheduleAnchorObject>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/ScheduleInstanceAnchorObject.cs b/BunqSdk/Model/Generated/Object/ScheduleInstanceAnchorObject.cs
index 8f07c40..777b574 100644
--- a/BunqSdk/Model/Generated/Object/ScheduleInstanceAnchorObject.cs
+++ b/BunqSdk/Model/Generated/Object/ScheduleInstanceAnchorObject.cs
@@ -2,6 +2,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,19 +14,20 @@ public class ScheduleInstanceAnchorObject : BunqModel, IAnchorObjectInterface
         /// Error constants.
         /// </summary>
         private const string ERROR_NULL_FIELDS = "All fields of an extended model or object are null.";
-
-
+    
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "Payment")]
         public Payment Payment { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "PaymentBatch")]
         public PaymentBatch PaymentBatch { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -34,15 +36,15 @@ public BunqModel GetReferencedObject()
             {
                 return this.Payment;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return this.PaymentBatch;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -51,20 +53,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.PaymentBatch != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ScheduleInstanceAnchorObject CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ScheduleInstanceAnchorObject>(json);
+            return BunqModel.CreateFromJsonString<ScheduleInstanceAnchorObject>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/SchedulePaymentEntry.cs b/BunqSdk/Model/Generated/Object/SchedulePaymentEntry.cs
index b6d03d0..ef57b90 100644
--- a/BunqSdk/Model/Generated/Object/SchedulePaymentEntry.cs
+++ b/BunqSdk/Model/Generated/Object/SchedulePaymentEntry.cs
@@ -1,6 +1,6 @@
-using System.Collections.Generic;
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -14,53 +14,53 @@ public class SchedulePaymentEntry : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "amount")]
         public Amount Amount { 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 for the Payment. Maximum 140 characters for Payments to external IBANs, 9000 characters for
         /// Payments to only other bunq MonetaryAccounts.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
+    
         /// <summary>
         /// The Attachments attached to the Payment.
         /// </summary>
         [JsonProperty(PropertyName = "attachment")]
         public List<AttachmentMonetaryAccountPayment> Attachment { get; set; }
-
+    
         /// <summary>
         /// Optional data included with the Payment specific to the merchant.
         /// </summary>
         [JsonProperty(PropertyName = "merchant_reference")]
         public string MerchantReference { get; set; }
-
+    
         /// <summary>
         /// Whether or not sending a bunq.to payment is allowed.
         /// </summary>
         [JsonProperty(PropertyName = "allow_bunqto")]
         public bool? AllowBunqto { 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; }
-
-
+    
+    
         public SchedulePaymentEntry(Amount amount, MonetaryAccountReference counterpartyAlias, string description)
         {
             Amount = amount;
             CounterpartyAlias = counterpartyAlias;
             Description = description;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -69,40 +69,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Alias != null)
             {
                 return false;
             }
-
+    
             if (this.CounterpartyAlias != null)
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             if (this.Attachment != null)
             {
                 return false;
             }
-
+    
             if (this.MerchantReference != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static SchedulePaymentEntry CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<SchedulePaymentEntry>(json);
+            return BunqModel.CreateFromJsonString<SchedulePaymentEntry>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/ShareDetail.cs b/BunqSdk/Model/Generated/Object/ShareDetail.cs
index 944eeaa..e48cab4 100644
--- a/BunqSdk/Model/Generated/Object/ShareDetail.cs
+++ b/BunqSdk/Model/Generated/Object/ShareDetail.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,21 +13,22 @@ public class ShareDetail : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "ShareDetailPayment")]
         public ShareDetailPayment Payment { get; set; }
-
+    
         /// <summary>
         /// The share details for viewing a share. In the response 'read_only' is replaced by 'ShareDetailReadOnly'.
         /// </summary>
         [JsonProperty(PropertyName = "ShareDetailReadOnly")]
         public ShareDetailReadOnly ReadOnly { get; set; }
-
+    
         /// <summary>
         /// The share details for a draft payment share. In the response 'draft_payment' is replaced by
         /// 'ShareDetailDraftPayment'.
         /// </summary>
         [JsonProperty(PropertyName = "ShareDetailDraftPayment")]
         public ShareDetailDraftPayment DraftPayment { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -35,25 +37,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ReadOnly != null)
             {
                 return false;
             }
-
+    
             if (this.DraftPayment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ShareDetail CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ShareDetail>(json);
+            return BunqModel.CreateFromJsonString<ShareDetail>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/ShareDetailDraftPayment.cs b/BunqSdk/Model/Generated/Object/ShareDetailDraftPayment.cs
index 8af6fe0..7ad05e5 100644
--- a/BunqSdk/Model/Generated/Object/ShareDetailDraftPayment.cs
+++ b/BunqSdk/Model/Generated/Object/ShareDetailDraftPayment.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,36 +13,35 @@ public class ShareDetailDraftPayment : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "make_draft_payments")]
         public bool? MakeDraftPayments { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to view the account balance.
         /// </summary>
         [JsonProperty(PropertyName = "view_balance")]
         public bool? ViewBalance { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to view events from before the share was active.
         /// </summary>
         [JsonProperty(PropertyName = "view_old_events")]
         public bool? ViewOldEvents { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to view events starting from the time the share became active.
         /// </summary>
         [JsonProperty(PropertyName = "view_new_events")]
         public bool? ViewNewEvents { get; set; }
-
-
-        public ShareDetailDraftPayment(bool? makeDraftPayments, bool? viewBalance, bool? viewOldEvents,
-            bool? viewNewEvents)
+    
+    
+        public ShareDetailDraftPayment(bool? makeDraftPayments, bool? viewBalance, bool? viewOldEvents, bool? viewNewEvents)
         {
             MakeDraftPayments = makeDraftPayments;
             ViewBalance = viewBalance;
             ViewOldEvents = viewOldEvents;
             ViewNewEvents = viewNewEvents;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -50,30 +50,30 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ViewBalance != null)
             {
                 return false;
             }
-
+    
             if (this.ViewOldEvents != null)
             {
                 return false;
             }
-
+    
             if (this.ViewNewEvents != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ShareDetailDraftPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ShareDetailDraftPayment>(json);
+            return BunqModel.CreateFromJsonString<ShareDetailDraftPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/ShareDetailPayment.cs b/BunqSdk/Model/Generated/Object/ShareDetailPayment.cs
index f589146..e2ca99c 100644
--- a/BunqSdk/Model/Generated/Object/ShareDetailPayment.cs
+++ b/BunqSdk/Model/Generated/Object/ShareDetailPayment.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,38 +13,38 @@ public class ShareDetailPayment : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "make_payments")]
         public bool? MakePayments { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to make draft payments from the shared account.
         /// </summary>
         [JsonProperty(PropertyName = "make_draft_payments")]
         public bool? MakeDraftPayments { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to view the account balance.
         /// </summary>
         [JsonProperty(PropertyName = "view_balance")]
         public bool? ViewBalance { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to view events from before the share was active.
         /// </summary>
         [JsonProperty(PropertyName = "view_old_events")]
         public bool? ViewOldEvents { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to view events starting from the time the share became active.
         /// </summary>
         [JsonProperty(PropertyName = "view_new_events")]
         public bool? ViewNewEvents { get; set; }
-
+    
         /// <summary>
         /// The budget restriction.
         /// </summary>
         [JsonProperty(PropertyName = "budget")]
         public BudgetRestriction Budget { get; set; }
-
-
+    
+    
         public ShareDetailPayment(bool? makePayments, bool? viewBalance, bool? viewOldEvents, bool? viewNewEvents)
         {
             MakePayments = makePayments;
@@ -51,8 +52,8 @@ public ShareDetailPayment(bool? makePayments, bool? viewBalance, bool? viewOldEv
             ViewOldEvents = viewOldEvents;
             ViewNewEvents = viewNewEvents;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -61,40 +62,40 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.MakeDraftPayments != null)
             {
                 return false;
             }
-
+    
             if (this.ViewBalance != null)
             {
                 return false;
             }
-
+    
             if (this.ViewOldEvents != null)
             {
                 return false;
             }
-
+    
             if (this.ViewNewEvents != null)
             {
                 return false;
             }
-
+    
             if (this.Budget != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ShareDetailPayment CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ShareDetailPayment>(json);
+            return BunqModel.CreateFromJsonString<ShareDetailPayment>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/ShareDetailReadOnly.cs b/BunqSdk/Model/Generated/Object/ShareDetailReadOnly.cs
index cd0e909..5d1d5c3 100644
--- a/BunqSdk/Model/Generated/Object/ShareDetailReadOnly.cs
+++ b/BunqSdk/Model/Generated/Object/ShareDetailReadOnly.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,28 +13,28 @@ public class ShareDetailReadOnly : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "view_balance")]
         public bool? ViewBalance { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to view events from before the share was active.
         /// </summary>
         [JsonProperty(PropertyName = "view_old_events")]
         public bool? ViewOldEvents { get; set; }
-
+    
         /// <summary>
         /// If set to true, the invited user will be able to view events starting from the time the share became active.
         /// </summary>
         [JsonProperty(PropertyName = "view_new_events")]
         public bool? ViewNewEvents { get; set; }
-
-
+    
+    
         public ShareDetailReadOnly(bool? viewBalance, bool? viewOldEvents, bool? viewNewEvents)
         {
             ViewBalance = viewBalance;
             ViewOldEvents = viewOldEvents;
             ViewNewEvents = viewNewEvents;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -42,25 +43,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ViewOldEvents != null)
             {
                 return false;
             }
-
+    
             if (this.ViewNewEvents != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static ShareDetailReadOnly CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<ShareDetailReadOnly>(json);
+            return BunqModel.CreateFromJsonString<ShareDetailReadOnly>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/TabTextWaitingScreen.cs b/BunqSdk/Model/Generated/Object/TabTextWaitingScreen.cs
index 5ee381c..8b4b899 100644
--- a/BunqSdk/Model/Generated/Object/TabTextWaitingScreen.cs
+++ b/BunqSdk/Model/Generated/Object/TabTextWaitingScreen.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,21 +13,21 @@ public class TabTextWaitingScreen : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "language")]
         public string Language { get; set; }
-
+    
         /// <summary>
         /// Tab text
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
-
-
+    
+    
         public TabTextWaitingScreen(string language, string description)
         {
             Language = language;
             Description = description;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -35,20 +36,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Description != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabTextWaitingScreen CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabTextWaitingScreen>(json);
+            return BunqModel.CreateFromJsonString<TabTextWaitingScreen>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/TabVisibility.cs b/BunqSdk/Model/Generated/Object/TabVisibility.cs
index 4edc761..553a33b 100644
--- a/BunqSdk/Model/Generated/Object/TabVisibility.cs
+++ b/BunqSdk/Model/Generated/Object/TabVisibility.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,28 +13,28 @@ public class TabVisibility : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "cash_register_qr_code")]
         public bool? CashRegisterQrCode { get; set; }
-
+    
         /// <summary>
         /// When true the tab will be visible through its own QR code. Use ../tab/{tab-id}/qr-code-content to get the
         /// raw content of this QR code
         /// </summary>
         [JsonProperty(PropertyName = "tab_qr_code")]
         public bool? TabQrCode { get; set; }
-
+    
         /// <summary>
         /// The location of the Tab in NearPay.
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public Geolocation Location { get; set; }
-
-
+    
+    
         public TabVisibility(bool? cashRegisterQrCode, bool? tabQrCode)
         {
             CashRegisterQrCode = cashRegisterQrCode;
             TabQrCode = tabQrCode;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -42,25 +43,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TabQrCode != null)
             {
                 return false;
             }
-
+    
             if (this.Location != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TabVisibility CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TabVisibility>(json);
+            return BunqModel.CreateFromJsonString<TabVisibility>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/TaxResident.cs b/BunqSdk/Model/Generated/Object/TaxResident.cs
index 1762d48..58e750e 100644
--- a/BunqSdk/Model/Generated/Object/TaxResident.cs
+++ b/BunqSdk/Model/Generated/Object/TaxResident.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,27 +13,27 @@ public class TaxResident : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "country")]
         public string Country { get; set; }
-
+    
         /// <summary>
         /// The tax number.
         /// </summary>
         [JsonProperty(PropertyName = "tax_number")]
         public string TaxNumber { get; set; }
-
+    
         /// <summary>
         /// The status of the tax number. Either CONFIRMED or UNCONFIRMED.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
-
-
+    
+    
         public TaxResident(string country, string taxNumber)
         {
             Country = country;
             TaxNumber = taxNumber;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -41,25 +42,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.TaxNumber != null)
             {
                 return false;
             }
-
+    
             if (this.Status != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TaxResident CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TaxResident>(json);
+            return BunqModel.CreateFromJsonString<TaxResident>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/TransferwiseRequirementField.cs b/BunqSdk/Model/Generated/Object/TransferwiseRequirementField.cs
index 5fa3fbc..bb3fa97 100644
--- a/BunqSdk/Model/Generated/Object/TransferwiseRequirementField.cs
+++ b/BunqSdk/Model/Generated/Object/TransferwiseRequirementField.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,33 +13,33 @@ public class TransferwiseRequirementField : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "key")]
         public string Key { get; set; }
-
+    
         /// <summary>
         /// The value of the required field.
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public string Value { get; set; }
-
+    
         /// <summary>
         /// The descriptive label of the field.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
+    
         /// <summary>
         /// The field group.
         /// </summary>
         [JsonProperty(PropertyName = "group")]
         public TransferwiseRequirementFieldGroup Group { get; set; }
-
-
+    
+    
         public TransferwiseRequirementField(string key, string value)
         {
             Key = key;
             Value = value;
         }
-
-
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -47,20 +48,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Group != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseRequirementField CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseRequirementField>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseRequirementField>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroup.cs b/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroup.cs
index 7295f18..f289f3c 100644
--- a/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroup.cs
+++ b/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroup.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,75 +13,76 @@ public class TransferwiseRequirementFieldGroup : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "key")]
         public string Key { get; set; }
-
+    
         /// <summary>
         /// The field's input type: "text", "select" or "radio".
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; set; }
-
+    
         /// <summary>
         /// The field name.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
+    
         /// <summary>
         /// Indicates that any changes in this field affect the requirements, if this field is changed, the requirements
         /// endpoint must be called again to recheck if there are any additional requirements.
         /// </summary>
         [JsonProperty(PropertyName = "refresh_requirements_on_change")]
         public bool? RefreshRequirementsOnChange { get; set; }
-
+    
         /// <summary>
         /// Whether or not the field is required.
         /// </summary>
         [JsonProperty(PropertyName = "required")]
         public bool? Required { get; set; }
-
+    
         /// <summary>
         /// Formatting mask to guide user input.
         /// </summary>
         [JsonProperty(PropertyName = "display_format")]
         public string DisplayFormat { get; set; }
-
+    
         /// <summary>
         /// An example value for this field.
         /// </summary>
         [JsonProperty(PropertyName = "example")]
         public string Example { get; set; }
-
+    
         /// <summary>
         /// The minimum length of the field's value.
         /// </summary>
         [JsonProperty(PropertyName = "min_length")]
         public string MinLength { get; set; }
-
+    
         /// <summary>
         /// The maximum length of the field's value.
         /// </summary>
         [JsonProperty(PropertyName = "max_length")]
         public string MaxLength { get; set; }
-
+    
         /// <summary>
         /// A regular expression which may be used to validate the user input.
         /// </summary>
         [JsonProperty(PropertyName = "validation_regexp")]
         public string ValidationRegexp { get; set; }
-
+    
         /// <summary>
         /// Details of an endpoint which may be used to validate the user input.
         /// </summary>
         [JsonProperty(PropertyName = "validation_async")]
         public TransferwiseRequirementFieldGroupValidationAsync ValidationAsync { get; set; }
-
+    
         /// <summary>
         /// Shows which values are allowed for fields of type "select" or "radio".
         /// </summary>
         [JsonProperty(PropertyName = "values_allowed")]
         public TransferwiseRequirementFieldGroupValuesAllowed ValuesAllowed { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -89,70 +91,70 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Type != null)
             {
                 return false;
             }
-
+    
             if (this.Name != null)
             {
                 return false;
             }
-
+    
             if (this.RefreshRequirementsOnChange != null)
             {
                 return false;
             }
-
+    
             if (this.Required != null)
             {
                 return false;
             }
-
+    
             if (this.DisplayFormat != null)
             {
                 return false;
             }
-
+    
             if (this.Example != null)
             {
                 return false;
             }
-
+    
             if (this.MinLength != null)
             {
                 return false;
             }
-
+    
             if (this.MaxLength != null)
             {
                 return false;
             }
-
+    
             if (this.ValidationRegexp != null)
             {
                 return false;
             }
-
+    
             if (this.ValidationAsync != null)
             {
                 return false;
             }
-
+    
             if (this.ValuesAllowed != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseRequirementFieldGroup CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseRequirementFieldGroup>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseRequirementFieldGroup>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValidationAsync.cs b/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValidationAsync.cs
index 523d45a..2e952a1 100644
--- a/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValidationAsync.cs
+++ b/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValidationAsync.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class TransferwiseRequirementFieldGroupValidationAsync : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "url")]
         public string Url { get; set; }
-
+    
         /// <summary>
         /// The parameters to send when validating user input.
         /// </summary>
         [JsonProperty(PropertyName = "params")]
         public TransferwiseRequirementFieldGroupValidationAsyncParams Params { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Params != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseRequirementFieldGroupValidationAsync CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseRequirementFieldGroupValidationAsync>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseRequirementFieldGroupValidationAsync>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValidationAsyncParams.cs b/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValidationAsyncParams.cs
index 1cd4e0c..6999098 100644
--- a/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValidationAsyncParams.cs
+++ b/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValidationAsyncParams.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,20 +13,21 @@ public class TransferwiseRequirementFieldGroupValidationAsyncParams : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "key")]
         public string Key { get; set; }
-
+    
         /// <summary>
         /// The parameter label.
         /// </summary>
         [JsonProperty(PropertyName = "parameter_name")]
         public string ParameterName { get; set; }
-
+    
         /// <summary>
         /// Shows whether the parameter is required or not.
         /// </summary>
         [JsonProperty(PropertyName = "required")]
         public bool? Required { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -34,25 +36,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.ParameterName != null)
             {
                 return false;
             }
-
+    
             if (this.Required != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseRequirementFieldGroupValidationAsyncParams CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseRequirementFieldGroupValidationAsyncParams>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseRequirementFieldGroupValidationAsyncParams>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValuesAllowed.cs b/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValuesAllowed.cs
index 7ea0819..3c598eb 100644
--- a/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValuesAllowed.cs
+++ b/BunqSdk/Model/Generated/Object/TransferwiseRequirementFieldGroupValuesAllowed.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,14 +13,15 @@ public class TransferwiseRequirementFieldGroupValuesAllowed : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "key")]
         public string Key { get; set; }
-
+    
         /// <summary>
         /// The label.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -28,20 +30,20 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.Name != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static TransferwiseRequirementFieldGroupValuesAllowed CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<TransferwiseRequirementFieldGroupValuesAllowed>(json);
+            return BunqModel.CreateFromJsonString<TransferwiseRequirementFieldGroupValuesAllowed>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/Ubo.cs b/BunqSdk/Model/Generated/Object/Ubo.cs
index 8eeee1f..cbb9a53 100644
--- a/BunqSdk/Model/Generated/Object/Ubo.cs
+++ b/BunqSdk/Model/Generated/Object/Ubo.cs
@@ -1,5 +1,6 @@
 using Bunq.Sdk.Model.Core;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -12,20 +13,21 @@ public class Ubo : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
-
+    
         /// <summary>
         /// The date of birth of the ultimate beneficiary owner.
         /// </summary>
         [JsonProperty(PropertyName = "date_of_birth")]
         public string DateOfBirth { get; set; }
-
+    
         /// <summary>
         /// The nationality of the ultimate beneficiary owner.
         /// </summary>
         [JsonProperty(PropertyName = "nationality")]
         public string Nationality { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -34,25 +36,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.DateOfBirth != null)
             {
                 return false;
             }
-
+    
             if (this.Nationality != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static Ubo CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<Ubo>(json);
+            return BunqModel.CreateFromJsonString<Ubo>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/UserApiKeyAnchoredUser.cs b/BunqSdk/Model/Generated/Object/UserApiKeyAnchoredUser.cs
index 880e4a9..bb02686 100644
--- a/BunqSdk/Model/Generated/Object/UserApiKeyAnchoredUser.cs
+++ b/BunqSdk/Model/Generated/Object/UserApiKeyAnchoredUser.cs
@@ -2,6 +2,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,24 +14,25 @@ public class UserApiKeyAnchoredUser : BunqModel, IAnchorObjectInterface
         /// Error constants.
         /// </summary>
         private const string ERROR_NULL_FIELDS = "All fields of an extended model or object are null.";
-
-
+    
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "UserPerson")]
         public UserPerson UserPerson { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "UserCompany")]
         public UserCompany UserCompany { get; set; }
-
+    
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "UserPaymentServiceProvider")]
         public UserPaymentServiceProvider UserPaymentServiceProvider { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public BunqModel GetReferencedObject()
@@ -39,20 +41,20 @@ public BunqModel GetReferencedObject()
             {
                 return this.UserPerson;
             }
-
+    
             if (this.UserCompany != null)
             {
                 return this.UserCompany;
             }
-
+    
             if (this.UserPaymentServiceProvider != null)
             {
                 return this.UserPaymentServiceProvider;
             }
-
+    
             throw new BunqException(ERROR_NULL_FIELDS);
         }
-
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -61,25 +63,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.UserCompany != null)
             {
                 return false;
             }
-
+    
             if (this.UserPaymentServiceProvider != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static UserApiKeyAnchoredUser CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<UserApiKeyAnchoredUser>(json);
+            return BunqModel.CreateFromJsonString<UserApiKeyAnchoredUser>(json);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/BunqSdk/Model/Generated/Object/WhitelistResultViewAnchoredObject.cs b/BunqSdk/Model/Generated/Object/WhitelistResultViewAnchoredObject.cs
index d3bc885..86822ac 100644
--- a/BunqSdk/Model/Generated/Object/WhitelistResultViewAnchoredObject.cs
+++ b/BunqSdk/Model/Generated/Object/WhitelistResultViewAnchoredObject.cs
@@ -1,6 +1,7 @@
 using Bunq.Sdk.Model.Core;
 using Bunq.Sdk.Model.Generated.Endpoint;
 using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Bunq.Sdk.Model.Generated.Object
 {
@@ -13,20 +14,21 @@ public class WhitelistResultViewAnchoredObject : BunqModel
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public int? Id { get; set; }
-
+    
         /// <summary>
         /// The RequestResponse object
         /// </summary>
         [JsonProperty(PropertyName = "requestResponse")]
         public RequestResponse RequestResponse { get; set; }
-
+    
         /// <summary>
         /// The DraftPayment object
         /// </summary>
         [JsonProperty(PropertyName = "draftPayment")]
         public DraftPayment DraftPayment { get; set; }
-
-
+    
+    
+    
         /// <summary>
         /// </summary>
         public override bool IsAllFieldNull()
@@ -35,25 +37,25 @@ public override bool IsAllFieldNull()
             {
                 return false;
             }
-
+    
             if (this.RequestResponse != null)
             {
                 return false;
             }
-
+    
             if (this.DraftPayment != null)
             {
                 return false;
             }
-
+    
             return true;
         }
-
+    
         /// <summary>
         /// </summary>
         public static WhitelistResultViewAnchoredObject CreateFromJsonString(string json)
         {
-            return CreateFromJsonString<WhitelistResultViewAnchoredObject>(json);
+            return BunqModel.CreateFromJsonString<WhitelistResultViewAnchoredObject>(json);
         }
     }
-}
\ No newline at end of file
+}