diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b38a83b3..390fd873 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,28 @@ jobs:
       - name: Build Release
         run: dotnet build src -c Release /p:ContinuousIntegrationBuild=true
 
+  unit-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - uses: actions/checkout@master
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.x
+
+      - name: Install tools
+        run: |
+          dotnet tool restore
+
+      - name: Run Tests
+        run: |
+          dotnet test src
+
 
   publish:
     needs: [compile]
diff --git a/src/Merge.Client.Test/Merge.Client.Test.csproj b/src/Merge.Client.Test/Merge.Client.Test.csproj
index 7115984e..72d7067e 100644
--- a/src/Merge.Client.Test/Merge.Client.Test.csproj
+++ b/src/Merge.Client.Test/Merge.Client.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
diff --git a/src/Merge.Client.Test/TestClient.cs b/src/Merge.Client.Test/TestClient.cs
index db3abedc..80f1e36c 100644
--- a/src/Merge.Client.Test/TestClient.cs
+++ b/src/Merge.Client.Test/TestClient.cs
@@ -1,3 +1,8 @@
+using NUnit.Framework;
+
+#nullable enable
+
 namespace Merge.Client.Test;
 
+[TestFixture]
 public class TestClient { }
diff --git a/src/Merge.Client.sln b/src/Merge.Client.sln
index de410bf2..5055de51 100644
--- a/src/Merge.Client.sln
+++ b/src/Merge.Client.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{8D54A66D-E9D5-417E-9BE5-8FEF3F7F660F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client", "Merge.Client\Merge.Client.csproj", "{A3AE9724-FD51-4511-A208-1362EEC3D897}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{ECDC139A-E6BD-4FDD-9966-4F7EE068A1A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Merge.Client.Test", "Merge.Client.Test\Merge.Client.Test.csproj", "{2EEEB8C2-2D58-4A75-81DB-241CB40746BF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,13 +16,13 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8D54A66D-E9D5-417E-9BE5-8FEF3F7F660F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D54A66D-E9D5-417E-9BE5-8FEF3F7F660F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D54A66D-E9D5-417E-9BE5-8FEF3F7F660F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D54A66D-E9D5-417E-9BE5-8FEF3F7F660F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECDC139A-E6BD-4FDD-9966-4F7EE068A1A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECDC139A-E6BD-4FDD-9966-4F7EE068A1A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECDC139A-E6BD-4FDD-9966-4F7EE068A1A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECDC139A-E6BD-4FDD-9966-4F7EE068A1A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3AE9724-FD51-4511-A208-1362EEC3D897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3AE9724-FD51-4511-A208-1362EEC3D897}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3AE9724-FD51-4511-A208-1362EEC3D897}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3AE9724-FD51-4511-A208-1362EEC3D897}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EEEB8C2-2D58-4A75-81DB-241CB40746BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EEEB8C2-2D58-4A75-81DB-241CB40746BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EEEB8C2-2D58-4A75-81DB-241CB40746BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2EEEB8C2-2D58-4A75-81DB-241CB40746BF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/src/Merge.Client/Accounting/AccountDetails/AccountDetailsClient.cs b/src/Merge.Client/Accounting/AccountDetails/AccountDetailsClient.cs
index 7c26b411..8e6344f6 100644
--- a/src/Merge.Client/Accounting/AccountDetails/AccountDetailsClient.cs
+++ b/src/Merge.Client/Accounting/AccountDetails/AccountDetailsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AccountDetailsClient(RawClient client)
     /// <summary>
     /// Get details for a linked account.
     /// </summary>
-    public async Task<AccountDetails> RetrieveAsync()
+    public async Task<AccountDetails> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/account-details"
+                Path = "accounting/v1/account-details",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountDetails>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountDetails>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/AccountToken/AccountTokenClient.cs b/src/Merge.Client/Accounting/AccountToken/AccountTokenClient.cs
index fe1cfa42..afe1d2df 100644
--- a/src/Merge.Client/Accounting/AccountToken/AccountTokenClient.cs
+++ b/src/Merge.Client/Accounting/AccountToken/AccountTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,37 @@ public AccountTokenClient(RawClient client)
     /// <summary>
     /// Returns the account token for the end user with the provided public token.
     /// </summary>
-    public async Task<AccountToken> RetrieveAsync(string publicToken)
+    public async Task<AccountToken> RetrieveAsync(
+        string publicToken,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"accounting/v1/account-token/{publicToken}"
+                Path = $"accounting/v1/account-token/{publicToken}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/AccountingClient.cs b/src/Merge.Client/Accounting/AccountingClient.cs
index eaa4d52a..1d336394 100644
--- a/src/Merge.Client/Accounting/AccountingClient.cs
+++ b/src/Merge.Client/Accounting/AccountingClient.cs
@@ -1,5 +1,4 @@
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Accounting/AccountingPeriods/AccountingPeriodsClient.cs b/src/Merge.Client/Accounting/AccountingPeriods/AccountingPeriodsClient.cs
index 3e984e0f..2cd65fc9 100644
--- a/src/Merge.Client/Accounting/AccountingPeriods/AccountingPeriodsClient.cs
+++ b/src/Merge.Client/Accounting/AccountingPeriods/AccountingPeriodsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AccountingPeriodsClient(RawClient client)
     /// <summary>
     /// Returns a list of `AccountingPeriod` objects.
     /// </summary>
-    public async Task<PaginatedAccountingPeriodList> ListAsync(AccountingPeriodsListRequest request)
+    public async Task<PaginatedAccountingPeriodList> ListAsync(
+        AccountingPeriodsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -40,17 +43,31 @@ public async Task<PaginatedAccountingPeriodList> ListAsync(AccountingPeriodsList
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/accounting-periods",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountingPeriodList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountingPeriodList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -58,7 +75,8 @@ public async Task<PaginatedAccountingPeriodList> ListAsync(AccountingPeriodsList
     /// </summary>
     public async Task<AccountingPeriod> RetrieveAsync(
         string id,
-        AccountingPeriodsRetrieveRequest request
+        AccountingPeriodsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -69,16 +87,30 @@ AccountingPeriodsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/accounting-periods/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountingPeriod>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountingPeriod>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/AccountingPeriods/Requests/AccountingPeriodsListRequest.cs b/src/Merge.Client/Accounting/AccountingPeriods/Requests/AccountingPeriodsListRequest.cs
index 3b4f5920..f3008796 100644
--- a/src/Merge.Client/Accounting/AccountingPeriods/Requests/AccountingPeriodsListRequest.cs
+++ b/src/Merge.Client/Accounting/AccountingPeriods/Requests/AccountingPeriodsListRequest.cs
@@ -1,24 +1,24 @@
 namespace Merge.Client.Accounting;
 
-public class AccountingPeriodsListRequest
+public record AccountingPeriodsListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/AccountingPeriods/Requests/AccountingPeriodsRetrieveRequest.cs b/src/Merge.Client/Accounting/AccountingPeriods/Requests/AccountingPeriodsRetrieveRequest.cs
index d7fa2717..8fe02492 100644
--- a/src/Merge.Client/Accounting/AccountingPeriods/Requests/AccountingPeriodsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/AccountingPeriods/Requests/AccountingPeriodsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Accounting;
 
-public class AccountingPeriodsRetrieveRequest
+public record AccountingPeriodsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Accounts/AccountsClient.cs b/src/Merge.Client/Accounting/Accounts/AccountsClient.cs
index d57aff15..fbddbece 100644
--- a/src/Merge.Client/Accounting/Accounts/AccountsClient.cs
+++ b/src/Merge.Client/Accounting/Accounts/AccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AccountsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Account` objects.
     /// </summary>
-    public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
+    public async Task<PaginatedAccountList> ListAsync(
+        AccountsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -76,23 +85,40 @@ public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Account` object with the given values.
     /// </summary>
-    public async Task<AccountResponse> CreateAsync(AccountEndpointRequest request)
+    public async Task<AccountResponse> CreateAsync(
+        AccountEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -106,23 +132,41 @@ public async Task<AccountResponse> CreateAsync(AccountEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Account` object with the given `id`.
     /// </summary>
-    public async Task<Account> RetrieveAsync(string id, AccountsRetrieveRequest request)
+    public async Task<Account> RetrieveAsync(
+        string id,
+        AccountsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -144,36 +188,64 @@ public async Task<Account> RetrieveAsync(string id, AccountsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/accounts/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Account>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Account>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Account` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/accounts/meta/post"
+                Path = "accounting/v1/accounts/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Accounts/Requests/AccountEndpointRequest.cs b/src/Merge.Client/Accounting/Accounts/Requests/AccountEndpointRequest.cs
index 17cb746d..41ae6f38 100644
--- a/src/Merge.Client/Accounting/Accounts/Requests/AccountEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/Accounts/Requests/AccountEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class AccountEndpointRequest
+public record AccountEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public AccountRequest Model { get; init; }
+    public required AccountRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Accounts/Requests/AccountsListRequest.cs b/src/Merge.Client/Accounting/Accounts/Requests/AccountsListRequest.cs
index 9146b23a..14419f66 100644
--- a/src/Merge.Client/Accounting/Accounts/Requests/AccountsListRequest.cs
+++ b/src/Merge.Client/Accounting/Accounts/Requests/AccountsListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class AccountsListRequest
+public record AccountsListRequest
 {
     /// <summary>
     /// If provided, will only return accounts for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public AccountsListRequestRemoteFields? RemoteFields { get; init; }
+    public AccountsListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public AccountsListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public AccountsListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Accounts/Requests/AccountsRetrieveRequest.cs b/src/Merge.Client/Accounting/Accounts/Requests/AccountsRetrieveRequest.cs
index f0471292..0d26c41c 100644
--- a/src/Merge.Client/Accounting/Accounts/Requests/AccountsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Accounts/Requests/AccountsRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class AccountsRetrieveRequest
+public record AccountsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public AccountsRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public AccountsRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public AccountsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public AccountsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Accounts/Types/AccountsListRequestRemoteFields.cs b/src/Merge.Client/Accounting/Accounts/Types/AccountsListRequestRemoteFields.cs
index 2f8a2753..c487b764 100644
--- a/src/Merge.Client/Accounting/Accounts/Types/AccountsListRequestRemoteFields.cs
+++ b/src/Merge.Client/Accounting/Accounts/Types/AccountsListRequestRemoteFields.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Accounts/Types/AccountsListRequestShowEnumOrigins.cs b/src/Merge.Client/Accounting/Accounts/Types/AccountsListRequestShowEnumOrigins.cs
index cf75e37a..4c55c912 100644
--- a/src/Merge.Client/Accounting/Accounts/Types/AccountsListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Accounting/Accounts/Types/AccountsListRequestShowEnumOrigins.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Accounts/Types/AccountsRetrieveRequestRemoteFields.cs b/src/Merge.Client/Accounting/Accounts/Types/AccountsRetrieveRequestRemoteFields.cs
index 524b8f81..056bb043 100644
--- a/src/Merge.Client/Accounting/Accounts/Types/AccountsRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Accounting/Accounts/Types/AccountsRetrieveRequestRemoteFields.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Accounts/Types/AccountsRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Accounting/Accounts/Types/AccountsRetrieveRequestShowEnumOrigins.cs
index 65f4e15a..ce5ee6b8 100644
--- a/src/Merge.Client/Accounting/Accounts/Types/AccountsRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Accounting/Accounts/Types/AccountsRetrieveRequestShowEnumOrigins.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Addresses/AddressesClient.cs b/src/Merge.Client/Accounting/Addresses/AddressesClient.cs
index 70b8a2d0..3056f10d 100644
--- a/src/Merge.Client/Accounting/Addresses/AddressesClient.cs
+++ b/src/Merge.Client/Accounting/Addresses/AddressesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,11 @@ public AddressesClient(RawClient client)
     /// <summary>
     /// Returns an `Address` object with the given `id`.
     /// </summary>
-    public async Task<Address> RetrieveAsync(string id, AddressesRetrieveRequest request)
+    public async Task<Address> RetrieveAsync(
+        string id,
+        AddressesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -36,16 +40,30 @@ public async Task<Address> RetrieveAsync(string id, AddressesRetrieveRequest req
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/addresses/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Address>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Address>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Addresses/Requests/AddressesRetrieveRequest.cs b/src/Merge.Client/Accounting/Addresses/Requests/AddressesRetrieveRequest.cs
index aa658aa7..49e97c47 100644
--- a/src/Merge.Client/Accounting/Addresses/Requests/AddressesRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Addresses/Requests/AddressesRetrieveRequest.cs
@@ -1,19 +1,19 @@
 namespace Merge.Client.Accounting;
 
-public class AddressesRetrieveRequest
+public record AddressesRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/AsyncPassthrough/AsyncPassthroughClient.cs b/src/Merge.Client/Accounting/AsyncPassthrough/AsyncPassthroughClient.cs
index e5e43567..7a1a3919 100644
--- a/src/Merge.Client/Accounting/AsyncPassthrough/AsyncPassthroughClient.cs
+++ b/src/Merge.Client/Accounting/AsyncPassthrough/AsyncPassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,75 @@ public AsyncPassthroughClient(RawClient client)
     /// <summary>
     /// Asynchronously pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<AsyncPassthroughReciept> CreateAsync(DataPassthroughRequest request)
+    public async Task<AsyncPassthroughReciept> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/async-passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AsyncPassthroughReciept>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AsyncPassthroughReciept>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Retrieves data from earlier async-passthrough POST request
     /// </summary>
-    public async Task<RemoteResponse> RetrieveAsync(string asyncPassthroughReceiptId)
+    public async Task<RemoteResponse> RetrieveAsync(
+        string asyncPassthroughReceiptId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"accounting/v1/async-passthrough/{asyncPassthroughReceiptId}"
+                Path = $"accounting/v1/async-passthrough/{asyncPassthroughReceiptId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Attachments/AttachmentsClient.cs b/src/Merge.Client/Accounting/Attachments/AttachmentsClient.cs
index e40f00f7..e9ec7ce6 100644
--- a/src/Merge.Client/Accounting/Attachments/AttachmentsClient.cs
+++ b/src/Merge.Client/Accounting/Attachments/AttachmentsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AttachmentsClient(RawClient client)
     /// <summary>
     /// Returns a list of `AccountingAttachment` objects.
     /// </summary>
-    public async Task<PaginatedAccountingAttachmentList> ListAsync(AttachmentsListRequest request)
+    public async Task<PaginatedAccountingAttachmentList> ListAsync(
+        AttachmentsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedAccountingAttachmentList> ListAsync(AttachmentsListRe
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedAccountingAttachmentList> ListAsync(AttachmentsListRe
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -64,24 +73,39 @@ public async Task<PaginatedAccountingAttachmentList> ListAsync(AttachmentsListRe
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/attachments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountingAttachmentList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountingAttachmentList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `AccountingAttachment` object with the given values.
     /// </summary>
     public async Task<AccountingAttachmentResponse> CreateAsync(
-        AccountingAttachmentEndpointRequest request
+        AccountingAttachmentEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -96,17 +120,31 @@ AccountingAttachmentEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/attachments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountingAttachmentResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountingAttachmentResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -114,7 +152,8 @@ AccountingAttachmentEndpointRequest request
     /// </summary>
     public async Task<AccountingAttachment> RetrieveAsync(
         string id,
-        AttachmentsRetrieveRequest request
+        AttachmentsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -125,36 +164,64 @@ AttachmentsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/attachments/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountingAttachment>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountingAttachment>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `AccountingAttachment` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/attachments/meta/post"
+                Path = "accounting/v1/attachments/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Attachments/Requests/AccountingAttachmentEndpointRequest.cs b/src/Merge.Client/Accounting/Attachments/Requests/AccountingAttachmentEndpointRequest.cs
index 55691934..13d73c0a 100644
--- a/src/Merge.Client/Accounting/Attachments/Requests/AccountingAttachmentEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/Attachments/Requests/AccountingAttachmentEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class AccountingAttachmentEndpointRequest
+public record AccountingAttachmentEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public AccountingAttachmentRequest Model { get; init; }
+    public required AccountingAttachmentRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Attachments/Requests/AttachmentsListRequest.cs b/src/Merge.Client/Accounting/Attachments/Requests/AttachmentsListRequest.cs
index 4b558a6c..241d5567 100644
--- a/src/Merge.Client/Accounting/Attachments/Requests/AttachmentsListRequest.cs
+++ b/src/Merge.Client/Accounting/Attachments/Requests/AttachmentsListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Accounting;
 
-public class AttachmentsListRequest
+public record AttachmentsListRequest
 {
     /// <summary>
     /// If provided, will only return accounting attachments for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Attachments/Requests/AttachmentsRetrieveRequest.cs b/src/Merge.Client/Accounting/Attachments/Requests/AttachmentsRetrieveRequest.cs
index a5a4700a..a95b6aef 100644
--- a/src/Merge.Client/Accounting/Attachments/Requests/AttachmentsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Attachments/Requests/AttachmentsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Accounting;
 
-public class AttachmentsRetrieveRequest
+public record AttachmentsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/AuditTrail/AuditTrailClient.cs b/src/Merge.Client/Accounting/AuditTrail/AuditTrailClient.cs
index bbb83d62..1d7c526b 100644
--- a/src/Merge.Client/Accounting/AuditTrail/AuditTrailClient.cs
+++ b/src/Merge.Client/Accounting/AuditTrail/AuditTrailClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AuditTrailClient(RawClient client)
     /// <summary>
     /// Gets a list of audit trail events.
     /// </summary>
-    public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest request)
+    public async Task<PaginatedAuditLogEventList> ListAsync(
+        AuditTrailListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -48,16 +51,30 @@ public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/audit-trail",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAuditLogEventList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAuditLogEventList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/AuditTrail/Requests/AuditTrailListRequest.cs b/src/Merge.Client/Accounting/AuditTrail/Requests/AuditTrailListRequest.cs
index c0a5f488..580a9c34 100644
--- a/src/Merge.Client/Accounting/AuditTrail/Requests/AuditTrailListRequest.cs
+++ b/src/Merge.Client/Accounting/AuditTrail/Requests/AuditTrailListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Accounting;
 
-public class AuditTrailListRequest
+public record AuditTrailListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
     /// <summary>
     /// If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`
     /// </summary>
-    public string? EventType { get; init; }
+    public string? EventType { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// If provided, this will return events associated with the specified user email. Please note that the email address reflects the user's email at the time of the event, and may not be their current email.
     /// </summary>
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/AvailableActions/AvailableActionsClient.cs b/src/Merge.Client/Accounting/AvailableActions/AvailableActionsClient.cs
index 9475fb25..07c918d8 100644
--- a/src/Merge.Client/Accounting/AvailableActions/AvailableActionsClient.cs
+++ b/src/Merge.Client/Accounting/AvailableActions/AvailableActionsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AvailableActionsClient(RawClient client)
     /// <summary>
     /// Returns a list of models and actions available for an account.
     /// </summary>
-    public async Task<AvailableActions> RetrieveAsync()
+    public async Task<AvailableActions> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/available-actions"
+                Path = "accounting/v1/available-actions",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AvailableActions>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AvailableActions>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/BalanceSheets/BalanceSheetsClient.cs b/src/Merge.Client/Accounting/BalanceSheets/BalanceSheetsClient.cs
index 00b3dd48..d2eb2675 100644
--- a/src/Merge.Client/Accounting/BalanceSheets/BalanceSheetsClient.cs
+++ b/src/Merge.Client/Accounting/BalanceSheets/BalanceSheetsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public BalanceSheetsClient(RawClient client)
     /// <summary>
     /// Returns a list of `BalanceSheet` objects.
     /// </summary>
-    public async Task<PaginatedBalanceSheetList> ListAsync(BalanceSheetsListRequest request)
+    public async Task<PaginatedBalanceSheetList> ListAsync(
+        BalanceSheetsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedBalanceSheetList> ListAsync(BalanceSheetsListRequest
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedBalanceSheetList> ListAsync(BalanceSheetsListRequest
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -68,23 +77,41 @@ public async Task<PaginatedBalanceSheetList> ListAsync(BalanceSheetsListRequest
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/balance-sheets",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedBalanceSheetList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedBalanceSheetList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `BalanceSheet` object with the given `id`.
     /// </summary>
-    public async Task<BalanceSheet> RetrieveAsync(string id, BalanceSheetsRetrieveRequest request)
+    public async Task<BalanceSheet> RetrieveAsync(
+        string id,
+        BalanceSheetsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -98,16 +125,30 @@ public async Task<BalanceSheet> RetrieveAsync(string id, BalanceSheetsRetrieveRe
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/balance-sheets/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<BalanceSheet>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<BalanceSheet>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/BalanceSheets/Requests/BalanceSheetsListRequest.cs b/src/Merge.Client/Accounting/BalanceSheets/Requests/BalanceSheetsListRequest.cs
index 8e4ca474..1368f500 100644
--- a/src/Merge.Client/Accounting/BalanceSheets/Requests/BalanceSheetsListRequest.cs
+++ b/src/Merge.Client/Accounting/BalanceSheets/Requests/BalanceSheetsListRequest.cs
@@ -1,59 +1,59 @@
 namespace Merge.Client.Accounting;
 
-public class BalanceSheetsListRequest
+public record BalanceSheetsListRequest
 {
     /// <summary>
     /// If provided, will only return balance sheets for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/BalanceSheets/Requests/BalanceSheetsRetrieveRequest.cs b/src/Merge.Client/Accounting/BalanceSheets/Requests/BalanceSheetsRetrieveRequest.cs
index 9d7aa257..70e757a4 100644
--- a/src/Merge.Client/Accounting/BalanceSheets/Requests/BalanceSheetsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/BalanceSheets/Requests/BalanceSheetsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Accounting;
 
-public class BalanceSheetsRetrieveRequest
+public record BalanceSheetsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/CashFlowStatements/CashFlowStatementsClient.cs b/src/Merge.Client/Accounting/CashFlowStatements/CashFlowStatementsClient.cs
index ce1f1599..f10f4faa 100644
--- a/src/Merge.Client/Accounting/CashFlowStatements/CashFlowStatementsClient.cs
+++ b/src/Merge.Client/Accounting/CashFlowStatements/CashFlowStatementsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,7 +19,8 @@ public CashFlowStatementsClient(RawClient client)
     /// Returns a list of `CashFlowStatement` objects.
     /// </summary>
     public async Task<PaginatedCashFlowStatementList> ListAsync(
-        CashFlowStatementsListRequest request
+        CashFlowStatementsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -29,11 +30,13 @@ CashFlowStatementsListRequest request
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -53,11 +56,15 @@ CashFlowStatementsListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -70,17 +77,31 @@ CashFlowStatementsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/cash-flow-statements",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCashFlowStatementList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCashFlowStatementList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -88,7 +109,8 @@ CashFlowStatementsListRequest request
     /// </summary>
     public async Task<CashFlowStatement> RetrieveAsync(
         string id,
-        CashFlowStatementsRetrieveRequest request
+        CashFlowStatementsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -103,16 +125,30 @@ CashFlowStatementsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/cash-flow-statements/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CashFlowStatement>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CashFlowStatement>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/CashFlowStatements/Requests/CashFlowStatementsListRequest.cs b/src/Merge.Client/Accounting/CashFlowStatements/Requests/CashFlowStatementsListRequest.cs
index c9115777..d38ff15c 100644
--- a/src/Merge.Client/Accounting/CashFlowStatements/Requests/CashFlowStatementsListRequest.cs
+++ b/src/Merge.Client/Accounting/CashFlowStatements/Requests/CashFlowStatementsListRequest.cs
@@ -1,59 +1,59 @@
 namespace Merge.Client.Accounting;
 
-public class CashFlowStatementsListRequest
+public record CashFlowStatementsListRequest
 {
     /// <summary>
     /// If provided, will only return cash flow statements for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/CashFlowStatements/Requests/CashFlowStatementsRetrieveRequest.cs b/src/Merge.Client/Accounting/CashFlowStatements/Requests/CashFlowStatementsRetrieveRequest.cs
index 4ee951a7..56976943 100644
--- a/src/Merge.Client/Accounting/CashFlowStatements/Requests/CashFlowStatementsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/CashFlowStatements/Requests/CashFlowStatementsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Accounting;
 
-public class CashFlowStatementsRetrieveRequest
+public record CashFlowStatementsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/CompanyInfo/CompanyInfoClient.cs b/src/Merge.Client/Accounting/CompanyInfo/CompanyInfoClient.cs
index 58326778..cbf0ce9f 100644
--- a/src/Merge.Client/Accounting/CompanyInfo/CompanyInfoClient.cs
+++ b/src/Merge.Client/Accounting/CompanyInfo/CompanyInfoClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public CompanyInfoClient(RawClient client)
     /// <summary>
     /// Returns a list of `CompanyInfo` objects.
     /// </summary>
-    public async Task<PaginatedCompanyInfoList> ListAsync(CompanyInfoListRequest request)
+    public async Task<PaginatedCompanyInfoList> ListAsync(
+        CompanyInfoListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedCompanyInfoList> ListAsync(CompanyInfoListRequest req
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -64,23 +73,41 @@ public async Task<PaginatedCompanyInfoList> ListAsync(CompanyInfoListRequest req
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/company-info",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCompanyInfoList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCompanyInfoList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `CompanyInfo` object with the given `id`.
     /// </summary>
-    public async Task<CompanyInfo> RetrieveAsync(string id, CompanyInfoRetrieveRequest request)
+    public async Task<CompanyInfo> RetrieveAsync(
+        string id,
+        CompanyInfoRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -94,16 +121,30 @@ public async Task<CompanyInfo> RetrieveAsync(string id, CompanyInfoRetrieveReque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/company-info/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CompanyInfo>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CompanyInfo>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/CompanyInfo/Requests/CompanyInfoListRequest.cs b/src/Merge.Client/Accounting/CompanyInfo/Requests/CompanyInfoListRequest.cs
index d65f3fc8..8f4da390 100644
--- a/src/Merge.Client/Accounting/CompanyInfo/Requests/CompanyInfoListRequest.cs
+++ b/src/Merge.Client/Accounting/CompanyInfo/Requests/CompanyInfoListRequest.cs
@@ -1,58 +1,54 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class CompanyInfoListRequest
+public record CompanyInfoListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CompanyInfoListRequestExpand? Expand { get; init; }
+    public CompanyInfoListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/CompanyInfo/Requests/CompanyInfoRetrieveRequest.cs b/src/Merge.Client/Accounting/CompanyInfo/Requests/CompanyInfoRetrieveRequest.cs
index 84618676..698a34db 100644
--- a/src/Merge.Client/Accounting/CompanyInfo/Requests/CompanyInfoRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/CompanyInfo/Requests/CompanyInfoRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class CompanyInfoRetrieveRequest
+public record CompanyInfoRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CompanyInfoRetrieveRequestExpand? Expand { get; init; }
+    public CompanyInfoRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/CompanyInfo/Types/CompanyInfoListRequestExpand.cs b/src/Merge.Client/Accounting/CompanyInfo/Types/CompanyInfoListRequestExpand.cs
index 6e3e66ef..82a9ded7 100644
--- a/src/Merge.Client/Accounting/CompanyInfo/Types/CompanyInfoListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/CompanyInfo/Types/CompanyInfoListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/CompanyInfo/Types/CompanyInfoRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/CompanyInfo/Types/CompanyInfoRetrieveRequestExpand.cs
index 9cc493a4..858c10b8 100644
--- a/src/Merge.Client/Accounting/CompanyInfo/Types/CompanyInfoRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/CompanyInfo/Types/CompanyInfoRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Contacts/ContactsClient.cs b/src/Merge.Client/Accounting/Contacts/ContactsClient.cs
index cdd91a5e..d0a3e04e 100644
--- a/src/Merge.Client/Accounting/Contacts/ContactsClient.cs
+++ b/src/Merge.Client/Accounting/Contacts/ContactsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public ContactsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Contact` objects.
     /// </summary>
-    public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
+    public async Task<PaginatedContactList> ListAsync(
+        ContactsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -84,23 +93,40 @@ public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/contacts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedContactList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedContactList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Contact` object with the given values.
     /// </summary>
-    public async Task<ContactResponse> CreateAsync(ContactEndpointRequest request)
+    public async Task<ContactResponse> CreateAsync(
+        ContactEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -114,23 +140,41 @@ public async Task<ContactResponse> CreateAsync(ContactEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/contacts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ContactResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ContactResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Contact` object with the given `id`.
     /// </summary>
-    public async Task<Contact> RetrieveAsync(string id, ContactsRetrieveRequest request)
+    public async Task<Contact> RetrieveAsync(
+        string id,
+        ContactsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -152,36 +196,64 @@ public async Task<Contact> RetrieveAsync(string id, ContactsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/contacts/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Contact>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Contact>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Contact` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/contacts/meta/post"
+                Path = "accounting/v1/contacts/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Contacts/Requests/ContactEndpointRequest.cs b/src/Merge.Client/Accounting/Contacts/Requests/ContactEndpointRequest.cs
index 51da2002..8d677c4c 100644
--- a/src/Merge.Client/Accounting/Contacts/Requests/ContactEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/Contacts/Requests/ContactEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class ContactEndpointRequest
+public record ContactEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public ContactRequest Model { get; init; }
+    public required ContactRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Contacts/Requests/ContactsListRequest.cs b/src/Merge.Client/Accounting/Contacts/Requests/ContactsListRequest.cs
index 144c84d8..92d6b940 100644
--- a/src/Merge.Client/Accounting/Contacts/Requests/ContactsListRequest.cs
+++ b/src/Merge.Client/Accounting/Contacts/Requests/ContactsListRequest.cs
@@ -1,83 +1,79 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class ContactsListRequest
+public record ContactsListRequest
 {
     /// <summary>
     /// If provided, will only return contacts for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ContactsListRequestExpand? Expand { get; init; }
+    public ContactsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return Contacts that are denoted as customers.
     /// </summary>
-    public string? IsCustomer { get; init; }
+    public string? IsCustomer { get; set; }
 
     /// <summary>
     /// If provided, will only return Contacts that are denoted as suppliers.
     /// </summary>
-    public string? IsSupplier { get; init; }
+    public string? IsSupplier { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Contacts/Requests/ContactsRetrieveRequest.cs b/src/Merge.Client/Accounting/Contacts/Requests/ContactsRetrieveRequest.cs
index 70954d74..bccc3190 100644
--- a/src/Merge.Client/Accounting/Contacts/Requests/ContactsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Contacts/Requests/ContactsRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class ContactsRetrieveRequest
+public record ContactsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ContactsRetrieveRequestExpand? Expand { get; init; }
+    public ContactsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Contacts/Types/ContactsListRequestExpand.cs b/src/Merge.Client/Accounting/Contacts/Types/ContactsListRequestExpand.cs
index 189bc367..9e41ee83 100644
--- a/src/Merge.Client/Accounting/Contacts/Types/ContactsListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Contacts/Types/ContactsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Contacts/Types/ContactsRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/Contacts/Types/ContactsRetrieveRequestExpand.cs
index 6d3e7a61..563e7d97 100644
--- a/src/Merge.Client/Accounting/Contacts/Types/ContactsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Contacts/Types/ContactsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/CreditNotes/CreditNotesClient.cs b/src/Merge.Client/Accounting/CreditNotes/CreditNotesClient.cs
index bf4b8e46..a6a31747 100644
--- a/src/Merge.Client/Accounting/CreditNotes/CreditNotesClient.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/CreditNotesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public CreditNotesClient(RawClient client)
     /// <summary>
     /// Returns a list of `CreditNote` objects.
     /// </summary>
-    public async Task<PaginatedCreditNoteList> ListAsync(CreditNotesListRequest request)
+    public async Task<PaginatedCreditNoteList> ListAsync(
+        CreditNotesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedCreditNoteList> ListAsync(CreditNotesListRequest requ
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedCreditNoteList> ListAsync(CreditNotesListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -75,32 +84,54 @@ public async Task<PaginatedCreditNoteList> ListAsync(CreditNotesListRequest requ
         }
         if (request.TransactionDateAfter != null)
         {
-            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString("o0");
+            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.TransactionDateBefore != null)
         {
-            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString("o0");
+            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/credit-notes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCreditNoteList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCreditNoteList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `CreditNote` object with the given `id`.
     /// </summary>
-    public async Task<CreditNote> RetrieveAsync(string id, CreditNotesRetrieveRequest request)
+    public async Task<CreditNote> RetrieveAsync(
+        string id,
+        CreditNotesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -122,16 +153,30 @@ public async Task<CreditNote> RetrieveAsync(string id, CreditNotesRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/credit-notes/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CreditNote>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CreditNote>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/CreditNotes/Requests/CreditNotesListRequest.cs b/src/Merge.Client/Accounting/CreditNotes/Requests/CreditNotesListRequest.cs
index 3601abcb..13f9f8e9 100644
--- a/src/Merge.Client/Accounting/CreditNotes/Requests/CreditNotesListRequest.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/Requests/CreditNotesListRequest.cs
@@ -1,83 +1,79 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class CreditNotesListRequest
+public record CreditNotesListRequest
 {
     /// <summary>
     /// If provided, will only return credit notes for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CreditNotesListRequestExpand? Expand { get; init; }
+    public CreditNotesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public CreditNotesListRequestRemoteFields? RemoteFields { get; init; }
+    public CreditNotesListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public CreditNotesListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public CreditNotesListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? TransactionDateAfter { get; init; }
+    public DateTime? TransactionDateAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? TransactionDateBefore { get; init; }
+    public DateTime? TransactionDateBefore { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/CreditNotes/Requests/CreditNotesRetrieveRequest.cs b/src/Merge.Client/Accounting/CreditNotes/Requests/CreditNotesRetrieveRequest.cs
index 84b06fd4..9024d37d 100644
--- a/src/Merge.Client/Accounting/CreditNotes/Requests/CreditNotesRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/Requests/CreditNotesRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class CreditNotesRetrieveRequest
+public record CreditNotesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CreditNotesRetrieveRequestExpand? Expand { get; init; }
+    public CreditNotesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public CreditNotesRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public CreditNotesRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public CreditNotesRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public CreditNotesRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestExpand.cs b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestExpand.cs
index f17300c7..674c3b5d 100644
--- a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestRemoteFields.cs b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestRemoteFields.cs
index 07662ba5..004d2d2e 100644
--- a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestRemoteFields.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestRemoteFields.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestShowEnumOrigins.cs b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestShowEnumOrigins.cs
index 85ec1d73..b19739d4 100644
--- a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesListRequestShowEnumOrigins.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestExpand.cs
index e1ded587..638ac392 100644
--- a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestRemoteFields.cs b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestRemoteFields.cs
index 1d7e7f12..71ea6f0c 100644
--- a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestRemoteFields.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestShowEnumOrigins.cs
index 05f76a49..f6c607c4 100644
--- a/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Accounting/CreditNotes/Types/CreditNotesRetrieveRequestShowEnumOrigins.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/DeleteAccount/DeleteAccountClient.cs b/src/Merge.Client/Accounting/DeleteAccount/DeleteAccountClient.cs
index 62eae1ab..abe48d90 100644
--- a/src/Merge.Client/Accounting/DeleteAccount/DeleteAccountClient.cs
+++ b/src/Merge.Client/Accounting/DeleteAccount/DeleteAccountClient.cs
@@ -1,4 +1,5 @@
-using Merge.Client;
+using System.Net.Http;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -16,14 +17,26 @@ public DeleteAccountClient(RawClient client)
     /// <summary>
     /// Delete a linked account.
     /// </summary>
-    public async void DeleteAsync()
+    public async Task DeleteAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "accounting/v1/delete-account"
+                Path = "accounting/v1/delete-account",
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Expenses/ExpensesClient.cs b/src/Merge.Client/Accounting/Expenses/ExpensesClient.cs
index ade4e39e..ded67934 100644
--- a/src/Merge.Client/Accounting/Expenses/ExpensesClient.cs
+++ b/src/Merge.Client/Accounting/Expenses/ExpensesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public ExpensesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Expense` objects.
     /// </summary>
-    public async Task<PaginatedExpenseList> ListAsync(ExpensesListRequest request)
+    public async Task<PaginatedExpenseList> ListAsync(
+        ExpensesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedExpenseList> ListAsync(ExpensesListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedExpenseList> ListAsync(ExpensesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -67,32 +76,53 @@ public async Task<PaginatedExpenseList> ListAsync(ExpensesListRequest request)
         }
         if (request.TransactionDateAfter != null)
         {
-            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString("o0");
+            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.TransactionDateBefore != null)
         {
-            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString("o0");
+            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/expenses",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedExpenseList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedExpenseList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Expense` object with the given values.
     /// </summary>
-    public async Task<ExpenseResponse> CreateAsync(ExpenseEndpointRequest request)
+    public async Task<ExpenseResponse> CreateAsync(
+        ExpenseEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -106,23 +136,41 @@ public async Task<ExpenseResponse> CreateAsync(ExpenseEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/expenses",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ExpenseResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ExpenseResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Expense` object with the given `id`.
     /// </summary>
-    public async Task<Expense> RetrieveAsync(string id, ExpensesRetrieveRequest request)
+    public async Task<Expense> RetrieveAsync(
+        string id,
+        ExpensesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -136,36 +184,64 @@ public async Task<Expense> RetrieveAsync(string id, ExpensesRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/expenses/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Expense>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Expense>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Expense` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/expenses/meta/post"
+                Path = "accounting/v1/expenses/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Expenses/Requests/ExpenseEndpointRequest.cs b/src/Merge.Client/Accounting/Expenses/Requests/ExpenseEndpointRequest.cs
index aa612e7a..5941b40c 100644
--- a/src/Merge.Client/Accounting/Expenses/Requests/ExpenseEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/Expenses/Requests/ExpenseEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class ExpenseEndpointRequest
+public record ExpenseEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public ExpenseRequest Model { get; init; }
+    public required ExpenseRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Expenses/Requests/ExpensesListRequest.cs b/src/Merge.Client/Accounting/Expenses/Requests/ExpensesListRequest.cs
index 75e9fb06..8f9dd83e 100644
--- a/src/Merge.Client/Accounting/Expenses/Requests/ExpensesListRequest.cs
+++ b/src/Merge.Client/Accounting/Expenses/Requests/ExpensesListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class ExpensesListRequest
+public record ExpensesListRequest
 {
     /// <summary>
     /// If provided, will only return expenses for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ExpensesListRequestExpand? Expand { get; init; }
+    public ExpensesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? TransactionDateAfter { get; init; }
+    public DateTime? TransactionDateAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? TransactionDateBefore { get; init; }
+    public DateTime? TransactionDateBefore { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Expenses/Requests/ExpensesRetrieveRequest.cs b/src/Merge.Client/Accounting/Expenses/Requests/ExpensesRetrieveRequest.cs
index 9bb29b74..5e941e55 100644
--- a/src/Merge.Client/Accounting/Expenses/Requests/ExpensesRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Expenses/Requests/ExpensesRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class ExpensesRetrieveRequest
+public record ExpensesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ExpensesRetrieveRequestExpand? Expand { get; init; }
+    public ExpensesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Expenses/Types/ExpensesListRequestExpand.cs b/src/Merge.Client/Accounting/Expenses/Types/ExpensesListRequestExpand.cs
index 66db7711..c39b21bd 100644
--- a/src/Merge.Client/Accounting/Expenses/Types/ExpensesListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Expenses/Types/ExpensesListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Expenses/Types/ExpensesRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/Expenses/Types/ExpensesRetrieveRequestExpand.cs
index f1cfa247..8a276eb7 100644
--- a/src/Merge.Client/Accounting/Expenses/Types/ExpensesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Expenses/Types/ExpensesRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/FieldMapping/FieldMappingClient.cs b/src/Merge.Client/Accounting/FieldMapping/FieldMappingClient.cs
index f83096eb..6dc13006 100644
--- a/src/Merge.Client/Accounting/FieldMapping/FieldMappingClient.cs
+++ b/src/Merge.Client/Accounting/FieldMapping/FieldMappingClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,64 +18,112 @@ public FieldMappingClient(RawClient client)
     /// <summary>
     /// Get all Field Mappings for this Linked Account. Field Mappings are mappings between third-party Remote Fields and user defined Merge fields. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
-    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync()
+    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/field-mappings"
+                Path = "accounting/v1/field-mappings",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingApiInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingApiInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Create new Field Mappings that will be available after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsCreateAsync(
-        CreateFieldMappingRequest request
+        CreateFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/field-mappings",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Deletes Field Mappings for a Linked Account. All data related to this Field Mapping will be deleted and these changes will be reflected after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
-    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string fieldMappingId)
+    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(
+        string fieldMappingId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Delete,
-                Path = $"accounting/v1/field-mappings/{fieldMappingId}"
+                Path = $"accounting/v1/field-mappings/{fieldMappingId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -83,30 +131,46 @@ public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsPartialUpdateAsync(
         string fieldMappingId,
-        PatchedEditFieldMappingRequest request
+        PatchedEditFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"accounting/v1/field-mappings/{fieldMappingId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all remote fields for a Linked Account. Remote fields are third-party fields that are accessible after initial sync if remote_data is enabled. You can use remote fields to override existing Merge fields or map a new Merge field. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
     public async Task<RemoteFieldApiResponse> RemoteFieldsRetrieveAsync(
-        RemoteFieldsRetrieveRequest request
+        RemoteFieldsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -121,36 +185,66 @@ RemoteFieldsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/remote-fields",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all organization-wide Target Fields, this will not include any Linked Account specific Target Fields. Organization-wide Target Fields are additional fields appended to the Merge Common Model for all Linked Accounts in a category. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/target-fields/).
     /// </summary>
-    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync()
+    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/target-fields"
+                Path = "accounting/v1/target-fields",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ExternalTargetFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ExternalTargetFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/FieldMapping/Requests/CreateFieldMappingRequest.cs b/src/Merge.Client/Accounting/FieldMapping/Requests/CreateFieldMappingRequest.cs
index dcf1c000..ab753d95 100644
--- a/src/Merge.Client/Accounting/FieldMapping/Requests/CreateFieldMappingRequest.cs
+++ b/src/Merge.Client/Accounting/FieldMapping/Requests/CreateFieldMappingRequest.cs
@@ -4,41 +4,41 @@
 
 namespace Merge.Client.Accounting;
 
-public class CreateFieldMappingRequest
+public record CreateFieldMappingRequest
 {
     /// <summary>
     /// The name of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_name")]
-    public string TargetFieldName { get; init; }
+    public required string TargetFieldName { get; set; }
 
     /// <summary>
     /// The description of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_description")]
-    public string TargetFieldDescription { get; init; }
+    public required string TargetFieldDescription { get; set; }
 
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object> RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object> RemoteFieldTraversalPath { get; set; } = new List<object>();
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string RemoteMethod { get; init; }
+    public required string RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string RemoteUrlPath { get; init; }
+    public required string RemoteUrlPath { get; set; }
 
     /// <summary>
     /// The name of the Common Model that the remote field corresponds to in a given category.
     /// </summary>
     [JsonPropertyName("common_model_name")]
-    public string CommonModelName { get; init; }
+    public required string CommonModelName { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs b/src/Merge.Client/Accounting/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
index 6c5a244f..76dcf581 100644
--- a/src/Merge.Client/Accounting/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
+++ b/src/Merge.Client/Accounting/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Accounting;
 
-public class PatchedEditFieldMappingRequest
+public record PatchedEditFieldMappingRequest
 {
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object>? RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object>? RemoteFieldTraversalPath { get; set; }
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string? RemoteMethod { get; init; }
+    public string? RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string? RemoteUrlPath { get; init; }
+    public string? RemoteUrlPath { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs b/src/Merge.Client/Accounting/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
index 172102b2..2eeb8bba 100644
--- a/src/Merge.Client/Accounting/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Accounting;
 
-public class RemoteFieldsRetrieveRequest
+public record RemoteFieldsRetrieveRequest
 {
     /// <summary>
     /// A comma seperated list of Common Model names. If included, will only return Remote Fields for those Common Models.
     /// </summary>
-    public string? CommonModels { get; init; }
+    public string? CommonModels { get; set; }
 
     /// <summary>
     /// If true, will include example values, where available, for remote fields in the 3rd party platform. These examples come from active data from your customers.
     /// </summary>
-    public string? IncludeExampleValues { get; init; }
+    public string? IncludeExampleValues { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/ForceResync/ForceResyncClient.cs b/src/Merge.Client/Accounting/ForceResync/ForceResyncClient.cs
index 00e59577..a92e019b 100644
--- a/src/Merge.Client/Accounting/ForceResync/ForceResyncClient.cs
+++ b/src/Merge.Client/Accounting/ForceResync/ForceResyncClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,36 @@ public ForceResyncClient(RawClient client)
     /// <summary>
     /// Force re-sync of all models. This is available for all organizations via the dashboard. Force re-sync is also available programmatically via API for monthly, quarterly, and highest sync frequency customers on the Launch, Professional, or Enterprise plans. Doing so will consume a sync credit for the relevant linked account.
     /// </summary>
-    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync()
+    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "accounting/v1/sync-status/resync"
+                Path = "accounting/v1/sync-status/resync",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<SyncStatus>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<SyncStatus>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/GenerateKey/GenerateKeyClient.cs b/src/Merge.Client/Accounting/GenerateKey/GenerateKeyClient.cs
index 607e1b81..042a0ed3 100644
--- a/src/Merge.Client/Accounting/GenerateKey/GenerateKeyClient.cs
+++ b/src/Merge.Client/Accounting/GenerateKey/GenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public GenerateKeyClient(RawClient client)
     /// <summary>
     /// Create a remote key.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(GenerateRemoteKeyRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        GenerateRemoteKeyRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/generate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/GenerateKey/Requests/GenerateRemoteKeyRequest.cs b/src/Merge.Client/Accounting/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
index 01b6f2b5..7f7bec6c 100644
--- a/src/Merge.Client/Accounting/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
+++ b/src/Merge.Client/Accounting/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Accounting;
 
-public class GenerateRemoteKeyRequest
+public record GenerateRemoteKeyRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/IncomeStatements/IncomeStatementsClient.cs b/src/Merge.Client/Accounting/IncomeStatements/IncomeStatementsClient.cs
index 1c5be94b..073b5a5f 100644
--- a/src/Merge.Client/Accounting/IncomeStatements/IncomeStatementsClient.cs
+++ b/src/Merge.Client/Accounting/IncomeStatements/IncomeStatementsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public IncomeStatementsClient(RawClient client)
     /// <summary>
     /// Returns a list of `IncomeStatement` objects.
     /// </summary>
-    public async Task<PaginatedIncomeStatementList> ListAsync(IncomeStatementsListRequest request)
+    public async Task<PaginatedIncomeStatementList> ListAsync(
+        IncomeStatementsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedIncomeStatementList> ListAsync(IncomeStatementsListRe
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedIncomeStatementList> ListAsync(IncomeStatementsListRe
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -68,17 +77,31 @@ public async Task<PaginatedIncomeStatementList> ListAsync(IncomeStatementsListRe
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/income-statements",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedIncomeStatementList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedIncomeStatementList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -86,7 +109,8 @@ public async Task<PaginatedIncomeStatementList> ListAsync(IncomeStatementsListRe
     /// </summary>
     public async Task<IncomeStatement> RetrieveAsync(
         string id,
-        IncomeStatementsRetrieveRequest request
+        IncomeStatementsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -101,16 +125,30 @@ IncomeStatementsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/income-statements/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IncomeStatement>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IncomeStatement>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/IncomeStatements/Requests/IncomeStatementsListRequest.cs b/src/Merge.Client/Accounting/IncomeStatements/Requests/IncomeStatementsListRequest.cs
index a02927c2..c481a4d8 100644
--- a/src/Merge.Client/Accounting/IncomeStatements/Requests/IncomeStatementsListRequest.cs
+++ b/src/Merge.Client/Accounting/IncomeStatements/Requests/IncomeStatementsListRequest.cs
@@ -1,59 +1,59 @@
 namespace Merge.Client.Accounting;
 
-public class IncomeStatementsListRequest
+public record IncomeStatementsListRequest
 {
     /// <summary>
     /// If provided, will only return income statements for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/IncomeStatements/Requests/IncomeStatementsRetrieveRequest.cs b/src/Merge.Client/Accounting/IncomeStatements/Requests/IncomeStatementsRetrieveRequest.cs
index 33df0b69..84c9a0fa 100644
--- a/src/Merge.Client/Accounting/IncomeStatements/Requests/IncomeStatementsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/IncomeStatements/Requests/IncomeStatementsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Accounting;
 
-public class IncomeStatementsRetrieveRequest
+public record IncomeStatementsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Invoices/InvoicesClient.cs b/src/Merge.Client/Accounting/Invoices/InvoicesClient.cs
index 692f127e..fc5613d8 100644
--- a/src/Merge.Client/Accounting/Invoices/InvoicesClient.cs
+++ b/src/Merge.Client/Accounting/Invoices/InvoicesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public InvoicesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Invoice` objects.
     /// </summary>
-    public async Task<PaginatedInvoiceList> ListAsync(InvoicesListRequest request)
+    public async Task<PaginatedInvoiceList> ListAsync(
+        InvoicesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -31,11 +34,13 @@ public async Task<PaginatedInvoiceList> ListAsync(InvoicesListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -55,19 +60,27 @@ public async Task<PaginatedInvoiceList> ListAsync(InvoicesListRequest request)
         }
         if (request.IssueDateAfter != null)
         {
-            _query["issue_date_after"] = request.IssueDateAfter.Value.ToString("o0");
+            _query["issue_date_after"] = request.IssueDateAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.IssueDateBefore != null)
         {
-            _query["issue_date_before"] = request.IssueDateBefore.Value.ToString("o0");
+            _query["issue_date_before"] = request.IssueDateBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -92,23 +105,40 @@ public async Task<PaginatedInvoiceList> ListAsync(InvoicesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/invoices",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedInvoiceList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedInvoiceList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Invoice` object with the given values.
     /// </summary>
-    public async Task<InvoiceResponse> CreateAsync(InvoiceEndpointRequest request)
+    public async Task<InvoiceResponse> CreateAsync(
+        InvoiceEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -122,23 +152,41 @@ public async Task<InvoiceResponse> CreateAsync(InvoiceEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/invoices",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<InvoiceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<InvoiceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Invoice` object with the given `id`.
     /// </summary>
-    public async Task<Invoice> RetrieveAsync(string id, InvoicesRetrieveRequest request)
+    public async Task<Invoice> RetrieveAsync(
+        string id,
+        InvoicesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -160,17 +208,31 @@ public async Task<Invoice> RetrieveAsync(string id, InvoicesRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/invoices/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Invoice>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Invoice>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -178,7 +240,8 @@ public async Task<Invoice> RetrieveAsync(string id, InvoicesRetrieveRequest requ
     /// </summary>
     public async Task<InvoiceResponse> PartialUpdateAsync(
         string id,
-        PatchedInvoiceEndpointRequest request
+        PatchedInvoiceEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -193,56 +256,101 @@ PatchedInvoiceEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"accounting/v1/invoices/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<InvoiceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<InvoiceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Invoice` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"accounting/v1/invoices/meta/patch/{id}"
+                Path = $"accounting/v1/invoices/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Invoice` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/invoices/meta/post"
+                Path = "accounting/v1/invoices/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Invoices/Requests/InvoiceEndpointRequest.cs b/src/Merge.Client/Accounting/Invoices/Requests/InvoiceEndpointRequest.cs
index 3acb225f..413e94e7 100644
--- a/src/Merge.Client/Accounting/Invoices/Requests/InvoiceEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/Invoices/Requests/InvoiceEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class InvoiceEndpointRequest
+public record InvoiceEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public InvoiceRequest Model { get; init; }
+    public required InvoiceRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Invoices/Requests/InvoicesListRequest.cs b/src/Merge.Client/Accounting/Invoices/Requests/InvoicesListRequest.cs
index fcddbe64..06e9ca1a 100644
--- a/src/Merge.Client/Accounting/Invoices/Requests/InvoicesListRequest.cs
+++ b/src/Merge.Client/Accounting/Invoices/Requests/InvoicesListRequest.cs
@@ -1,90 +1,86 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class InvoicesListRequest
+public record InvoicesListRequest
 {
     /// <summary>
     /// If provided, will only return invoices for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return invoices for this contact.
     /// </summary>
-    public string? ContactId { get; init; }
+    public string? ContactId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public InvoicesListRequestExpand? Expand { get; init; }
+    public InvoicesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? IssueDateAfter { get; init; }
+    public DateTime? IssueDateAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? IssueDateBefore { get; init; }
+    public DateTime? IssueDateBefore { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return Invoices with this type
@@ -92,5 +88,5 @@ public class InvoicesListRequest
     /// - `ACCOUNTS_RECEIVABLE` - ACCOUNTS_RECEIVABLE
     /// - `ACCOUNTS_PAYABLE` - ACCOUNTS_PAYABLE
     /// </summary>
-    public InvoicesListRequestType? Type { get; init; }
+    public InvoicesListRequestType? Type { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Invoices/Requests/InvoicesRetrieveRequest.cs b/src/Merge.Client/Accounting/Invoices/Requests/InvoicesRetrieveRequest.cs
index 7aa10692..7ca62083 100644
--- a/src/Merge.Client/Accounting/Invoices/Requests/InvoicesRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Invoices/Requests/InvoicesRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class InvoicesRetrieveRequest
+public record InvoicesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public InvoicesRetrieveRequestExpand? Expand { get; init; }
+    public InvoicesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Invoices/Requests/PatchedInvoiceEndpointRequest.cs b/src/Merge.Client/Accounting/Invoices/Requests/PatchedInvoiceEndpointRequest.cs
index 00038980..8fdba43d 100644
--- a/src/Merge.Client/Accounting/Invoices/Requests/PatchedInvoiceEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/Invoices/Requests/PatchedInvoiceEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class PatchedInvoiceEndpointRequest
+public record PatchedInvoiceEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public InvoiceRequest Model { get; init; }
+    public required InvoiceRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Invoices/Types/InvoicesListRequestExpand.cs b/src/Merge.Client/Accounting/Invoices/Types/InvoicesListRequestExpand.cs
index b836e35f..22e98794 100644
--- a/src/Merge.Client/Accounting/Invoices/Types/InvoicesListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Invoices/Types/InvoicesListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Invoices/Types/InvoicesListRequestType.cs b/src/Merge.Client/Accounting/Invoices/Types/InvoicesListRequestType.cs
index b917d4ed..383f6dde 100644
--- a/src/Merge.Client/Accounting/Invoices/Types/InvoicesListRequestType.cs
+++ b/src/Merge.Client/Accounting/Invoices/Types/InvoicesListRequestType.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Invoices/Types/InvoicesRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/Invoices/Types/InvoicesRetrieveRequestExpand.cs
index ccc59c14..b2c7bcc7 100644
--- a/src/Merge.Client/Accounting/Invoices/Types/InvoicesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Invoices/Types/InvoicesRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Issues/IssuesClient.cs b/src/Merge.Client/Accounting/Issues/IssuesClient.cs
index f5ca8204..0936cc04 100644
--- a/src/Merge.Client/Accounting/Issues/IssuesClient.cs
+++ b/src/Merge.Client/Accounting/Issues/IssuesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public IssuesClient(RawClient client)
     /// <summary>
     /// Gets issues.
     /// </summary>
-    public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
+    public async Task<PaginatedIssueList> ListAsync(
+        IssuesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountToken != null)
@@ -40,13 +43,13 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         if (request.FirstIncidentTimeAfter != null)
         {
             _query["first_incident_time_after"] = request.FirstIncidentTimeAfter.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.FirstIncidentTimeBefore != null)
         {
             _query["first_incident_time_before"] = request.FirstIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.IncludeMuted != null)
@@ -59,12 +62,14 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         }
         if (request.LastIncidentTimeAfter != null)
         {
-            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString("o0");
+            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.LastIncidentTimeBefore != null)
         {
             _query["last_incident_time_before"] = request.LastIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.PageSize != null)
@@ -82,36 +87,64 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/issues",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedIssueList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedIssueList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get a specific issue.
     /// </summary>
-    public async Task<Issue> RetrieveAsync(string id)
+    public async Task<Issue> RetrieveAsync(string id, RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"accounting/v1/issues/{id}"
+                Path = $"accounting/v1/issues/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Issue>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Issue>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Issues/Requests/IssuesListRequest.cs b/src/Merge.Client/Accounting/Issues/Requests/IssuesListRequest.cs
index 13efd5c1..a9f2614d 100644
--- a/src/Merge.Client/Accounting/Issues/Requests/IssuesListRequest.cs
+++ b/src/Merge.Client/Accounting/Issues/Requests/IssuesListRequest.cs
@@ -1,61 +1,57 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class IssuesListRequest
+public record IssuesListRequest
 {
-    public string? AccountToken { get; init; }
+    public string? AccountToken { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was after this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeAfter { get; init; }
+    public DateTime? FirstIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was before this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeBefore { get; init; }
+    public DateTime? FirstIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If true, will include muted issues
     /// </summary>
-    public string? IncludeMuted { get; init; }
+    public string? IncludeMuted { get; set; }
 
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was after this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeAfter { get; init; }
+    public DateTime? LastIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was before this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeBefore { get; init; }
+    public DateTime? LastIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -63,5 +59,5 @@ public class IssuesListRequest
     /// - `ONGOING` - ONGOING
     /// - `RESOLVED` - RESOLVED
     /// </summary>
-    public IssuesListRequestStatus? Status { get; init; }
+    public IssuesListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Issues/Types/IssuesListRequestStatus.cs b/src/Merge.Client/Accounting/Issues/Types/IssuesListRequestStatus.cs
index 10469239..3a3fc0b5 100644
--- a/src/Merge.Client/Accounting/Issues/Types/IssuesListRequestStatus.cs
+++ b/src/Merge.Client/Accounting/Issues/Types/IssuesListRequestStatus.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Items/ItemsClient.cs b/src/Merge.Client/Accounting/Items/ItemsClient.cs
index 8792ad50..0147f9bd 100644
--- a/src/Merge.Client/Accounting/Items/ItemsClient.cs
+++ b/src/Merge.Client/Accounting/Items/ItemsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public ItemsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Item` objects.
     /// </summary>
-    public async Task<PaginatedItemList> ListAsync(ItemsListRequest request)
+    public async Task<PaginatedItemList> ListAsync(
+        ItemsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedItemList> ListAsync(ItemsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedItemList> ListAsync(ItemsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -76,23 +85,41 @@ public async Task<PaginatedItemList> ListAsync(ItemsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/items",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedItemList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedItemList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Item` object with the given `id`.
     /// </summary>
-    public async Task<Item> RetrieveAsync(string id, ItemsRetrieveRequest request)
+    public async Task<Item> RetrieveAsync(
+        string id,
+        ItemsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -114,16 +141,30 @@ public async Task<Item> RetrieveAsync(string id, ItemsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/items/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Item>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Item>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Items/Requests/ItemsListRequest.cs b/src/Merge.Client/Accounting/Items/Requests/ItemsListRequest.cs
index ff6e9d67..33618123 100644
--- a/src/Merge.Client/Accounting/Items/Requests/ItemsListRequest.cs
+++ b/src/Merge.Client/Accounting/Items/Requests/ItemsListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class ItemsListRequest
+public record ItemsListRequest
 {
     /// <summary>
     /// If provided, will only return items for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ItemsListRequestExpand? Expand { get; init; }
+    public ItemsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Items/Requests/ItemsRetrieveRequest.cs b/src/Merge.Client/Accounting/Items/Requests/ItemsRetrieveRequest.cs
index 6e8f239f..936e91c7 100644
--- a/src/Merge.Client/Accounting/Items/Requests/ItemsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Items/Requests/ItemsRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class ItemsRetrieveRequest
+public record ItemsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ItemsRetrieveRequestExpand? Expand { get; init; }
+    public ItemsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Items/Types/ItemsListRequestExpand.cs b/src/Merge.Client/Accounting/Items/Types/ItemsListRequestExpand.cs
index 95426bfe..677d6473 100644
--- a/src/Merge.Client/Accounting/Items/Types/ItemsListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Items/Types/ItemsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Items/Types/ItemsRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/Items/Types/ItemsRetrieveRequestExpand.cs
index 062222aa..1428a469 100644
--- a/src/Merge.Client/Accounting/Items/Types/ItemsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Items/Types/ItemsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/JournalEntries/JournalEntriesClient.cs b/src/Merge.Client/Accounting/JournalEntries/JournalEntriesClient.cs
index f105597d..437cc2db 100644
--- a/src/Merge.Client/Accounting/JournalEntries/JournalEntriesClient.cs
+++ b/src/Merge.Client/Accounting/JournalEntries/JournalEntriesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public JournalEntriesClient(RawClient client)
     /// <summary>
     /// Returns a list of `JournalEntry` objects.
     /// </summary>
-    public async Task<PaginatedJournalEntryList> ListAsync(JournalEntriesListRequest request)
+    public async Task<PaginatedJournalEntryList> ListAsync(
+        JournalEntriesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedJournalEntryList> ListAsync(JournalEntriesListRequest
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedJournalEntryList> ListAsync(JournalEntriesListRequest
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -67,32 +76,53 @@ public async Task<PaginatedJournalEntryList> ListAsync(JournalEntriesListRequest
         }
         if (request.TransactionDateAfter != null)
         {
-            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString("o0");
+            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.TransactionDateBefore != null)
         {
-            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString("o0");
+            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/journal-entries",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedJournalEntryList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedJournalEntryList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `JournalEntry` object with the given values.
     /// </summary>
-    public async Task<JournalEntryResponse> CreateAsync(JournalEntryEndpointRequest request)
+    public async Task<JournalEntryResponse> CreateAsync(
+        JournalEntryEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -106,23 +136,41 @@ public async Task<JournalEntryResponse> CreateAsync(JournalEntryEndpointRequest
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/journal-entries",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<JournalEntryResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<JournalEntryResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `JournalEntry` object with the given `id`.
     /// </summary>
-    public async Task<JournalEntry> RetrieveAsync(string id, JournalEntriesRetrieveRequest request)
+    public async Task<JournalEntry> RetrieveAsync(
+        string id,
+        JournalEntriesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -136,36 +184,64 @@ public async Task<JournalEntry> RetrieveAsync(string id, JournalEntriesRetrieveR
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/journal-entries/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<JournalEntry>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<JournalEntry>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `JournalEntry` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/journal-entries/meta/post"
+                Path = "accounting/v1/journal-entries/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntriesListRequest.cs b/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntriesListRequest.cs
index 696f0d09..45456946 100644
--- a/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntriesListRequest.cs
+++ b/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntriesListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class JournalEntriesListRequest
+public record JournalEntriesListRequest
 {
     /// <summary>
     /// If provided, will only return journal entries for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public JournalEntriesListRequestExpand? Expand { get; init; }
+    public JournalEntriesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? TransactionDateAfter { get; init; }
+    public DateTime? TransactionDateAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? TransactionDateBefore { get; init; }
+    public DateTime? TransactionDateBefore { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntriesRetrieveRequest.cs b/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntriesRetrieveRequest.cs
index 9eaa22b6..a13fd764 100644
--- a/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntriesRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntriesRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class JournalEntriesRetrieveRequest
+public record JournalEntriesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public JournalEntriesRetrieveRequestExpand? Expand { get; init; }
+    public JournalEntriesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntryEndpointRequest.cs b/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntryEndpointRequest.cs
index fdc5856f..8db67a69 100644
--- a/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntryEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/JournalEntries/Requests/JournalEntryEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class JournalEntryEndpointRequest
+public record JournalEntryEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public JournalEntryRequest Model { get; init; }
+    public required JournalEntryRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/JournalEntries/Types/JournalEntriesListRequestExpand.cs b/src/Merge.Client/Accounting/JournalEntries/Types/JournalEntriesListRequestExpand.cs
index 933fa6bd..fe29e3d8 100644
--- a/src/Merge.Client/Accounting/JournalEntries/Types/JournalEntriesListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/JournalEntries/Types/JournalEntriesListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/JournalEntries/Types/JournalEntriesRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/JournalEntries/Types/JournalEntriesRetrieveRequestExpand.cs
index 5cfc390b..e16f190a 100644
--- a/src/Merge.Client/Accounting/JournalEntries/Types/JournalEntriesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/JournalEntries/Types/JournalEntriesRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/LinkToken/LinkTokenClient.cs b/src/Merge.Client/Accounting/LinkToken/LinkTokenClient.cs
index 0b7756cb..5d287809 100644
--- a/src/Merge.Client/Accounting/LinkToken/LinkTokenClient.cs
+++ b/src/Merge.Client/Accounting/LinkToken/LinkTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public LinkTokenClient(RawClient client)
     /// <summary>
     /// Creates a link token to be used when linking a new end user.
     /// </summary>
-    public async Task<LinkToken> CreateAsync(EndUserDetailsRequest request)
+    public async Task<LinkToken> CreateAsync(
+        EndUserDetailsRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/link-token",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<LinkToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<LinkToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/LinkToken/Requests/EndUserDetailsRequest.cs b/src/Merge.Client/Accounting/LinkToken/Requests/EndUserDetailsRequest.cs
index 247fee5a..21151392 100644
--- a/src/Merge.Client/Accounting/LinkToken/Requests/EndUserDetailsRequest.cs
+++ b/src/Merge.Client/Accounting/LinkToken/Requests/EndUserDetailsRequest.cs
@@ -1,59 +1,58 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class EndUserDetailsRequest
+public record EndUserDetailsRequest
 {
     /// <summary>
     /// Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.
     /// </summary>
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// Your end user's organization.
     /// </summary>
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.
     /// </summary>
     [JsonPropertyName("end_user_origin_id")]
-    public string EndUserOriginId { get; init; }
+    public required string EndUserOriginId { get; set; }
 
     /// <summary>
     /// The integration categories to show in Merge Link.
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     /// <summary>
     /// The slug of a specific pre-selected integration for this linking flow token. For examples of slugs, see https://docs.merge.dev/guides/merge-link/single-integration/.
     /// </summary>
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     /// <summary>
     /// An integer number of minutes between [30, 720 or 10080 if for a Magic Link URL] for how long this token is valid. Defaults to 30.
     /// </summary>
     [JsonPropertyName("link_expiry_mins")]
-    public int? LinkExpiryMins { get; init; }
+    public int? LinkExpiryMins { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("should_create_magic_link_url")]
-    public bool? ShouldCreateMagicLinkUrl { get; init; }
+    public bool? ShouldCreateMagicLinkUrl { get; set; }
 
     /// <summary>
     /// An array of objects to specify the models and fields that will be disabled for a given Linked Account. Each object uses model_id, enabled_actions, and disabled_fields to specify the model, method, and fields that are scoped for a given Linked Account.
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; init; }
+    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; set; }
 
     /// <summary>
     /// When creating a Link Token, you can set permissions for Common Models that will apply to the account that is going to be linked. Any model or field not specified in link token payload will default to existing settings.
@@ -62,17 +61,17 @@ public class EndUserDetailsRequest
     public Dictionary<
         string,
         IEnumerable<IndividualCommonModelScopeDeserializerRequest>?
-    >? CategoryCommonModelScopes { get; init; }
+    >? CategoryCommonModelScopes { get; set; }
 
     /// <summary>
     /// The language code for the language to localize Merge Link to.
     /// </summary>
     [JsonPropertyName("language")]
-    public string? Language { get; init; }
+    public string? Language { get; set; }
 
     /// <summary>
     /// A JSON object containing integration-specific configuration options.
     /// </summary>
     [JsonPropertyName("integration_specific_config")]
-    public Dictionary<string, object>? IntegrationSpecificConfig { get; init; }
+    public Dictionary<string, object?>? IntegrationSpecificConfig { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/LinkedAccounts/LinkedAccountsClient.cs b/src/Merge.Client/Accounting/LinkedAccounts/LinkedAccountsClient.cs
index e4dec16f..89d82fd6 100644
--- a/src/Merge.Client/Accounting/LinkedAccounts/LinkedAccountsClient.cs
+++ b/src/Merge.Client/Accounting/LinkedAccounts/LinkedAccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,7 +19,8 @@ public LinkedAccountsClient(RawClient client)
     /// List linked accounts for your organization.
     /// </summary>
     public async Task<PaginatedAccountDetailsAndActionsList> ListAsync(
-        LinkedAccountsListRequest request
+        LinkedAccountsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -78,16 +79,30 @@ LinkedAccountsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/linked-accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/LinkedAccounts/Requests/LinkedAccountsListRequest.cs b/src/Merge.Client/Accounting/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
index 027ba05f..db0ffafc 100644
--- a/src/Merge.Client/Accounting/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
+++ b/src/Merge.Client/Accounting/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
@@ -1,10 +1,6 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class LinkedAccountsListRequest
+public record LinkedAccountsListRequest
 {
     /// <summary>
     /// Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
@@ -17,62 +13,62 @@ public class LinkedAccountsListRequest
     /// - `mktg` - mktg
     /// - `filestorage` - filestorage
     /// </summary>
-    public LinkedAccountsListRequestCategory? Category { get; init; }
+    public LinkedAccountsListRequestCategory? Category { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given email address.
     /// </summary>
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given organization name.
     /// </summary>
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given origin ID.
     /// </summary>
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     /// <summary>
     /// Comma-separated list of EndUser origin IDs, making it possible to specify multiple EndUsers at once.
     /// </summary>
-    public string? EndUserOriginIds { get; init; }
+    public string? EndUserOriginIds { get; set; }
 
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Comma-separated list of LinkedAccount IDs, making it possible to specify multiple LinkedAccounts at once.
     /// </summary>
-    public string? Ids { get; init; }
+    public string? Ids { get; set; }
 
     /// <summary>
     /// If `true`, will include complete production duplicates of the account specified by the `id` query parameter in the response. `id` must be for a complete production linked account.
     /// </summary>
-    public bool? IncludeDuplicates { get; init; }
+    public bool? IncludeDuplicates { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given integration name.
     /// </summary>
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If included, will only include test linked accounts. If not included, will only include non-test linked accounts.
     /// </summary>
-    public string? IsTestAccount { get; init; }
+    public string? IsTestAccount { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Filter by status. Options: `COMPLETE`, `INCOMPLETE`, `RELINK_NEEDED`
     /// </summary>
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs b/src/Merge.Client/Accounting/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
index 3cd777ce..bb11b49c 100644
--- a/src/Merge.Client/Accounting/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
+++ b/src/Merge.Client/Accounting/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Passthrough/PassthroughClient.cs b/src/Merge.Client/Accounting/Passthrough/PassthroughClient.cs
index 22c45efa..bf43445e 100644
--- a/src/Merge.Client/Accounting/Passthrough/PassthroughClient.cs
+++ b/src/Merge.Client/Accounting/Passthrough/PassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public PassthroughClient(RawClient client)
     /// <summary>
     /// Pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<RemoteResponse> CreateAsync(DataPassthroughRequest request)
+    public async Task<RemoteResponse> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Payments/PaymentsClient.cs b/src/Merge.Client/Accounting/Payments/PaymentsClient.cs
index d9595579..f181d2c4 100644
--- a/src/Merge.Client/Accounting/Payments/PaymentsClient.cs
+++ b/src/Merge.Client/Accounting/Payments/PaymentsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public PaymentsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Payment` objects.
     /// </summary>
-    public async Task<PaginatedPaymentList> ListAsync(PaymentsListRequest request)
+    public async Task<PaginatedPaymentList> ListAsync(
+        PaymentsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountId != null)
@@ -35,11 +38,13 @@ public async Task<PaginatedPaymentList> ListAsync(PaymentsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedPaymentList> ListAsync(PaymentsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -75,32 +84,53 @@ public async Task<PaginatedPaymentList> ListAsync(PaymentsListRequest request)
         }
         if (request.TransactionDateAfter != null)
         {
-            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString("o0");
+            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.TransactionDateBefore != null)
         {
-            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString("o0");
+            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/payments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedPaymentList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedPaymentList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Payment` object with the given values.
     /// </summary>
-    public async Task<PaymentResponse> CreateAsync(PaymentEndpointRequest request)
+    public async Task<PaymentResponse> CreateAsync(
+        PaymentEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -114,23 +144,41 @@ public async Task<PaymentResponse> CreateAsync(PaymentEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/payments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaymentResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaymentResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Payment` object with the given `id`.
     /// </summary>
-    public async Task<Payment> RetrieveAsync(string id, PaymentsRetrieveRequest request)
+    public async Task<Payment> RetrieveAsync(
+        string id,
+        PaymentsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -144,17 +192,31 @@ public async Task<Payment> RetrieveAsync(string id, PaymentsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/payments/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Payment>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Payment>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -162,7 +224,8 @@ public async Task<Payment> RetrieveAsync(string id, PaymentsRetrieveRequest requ
     /// </summary>
     public async Task<PaymentResponse> PartialUpdateAsync(
         string id,
-        PatchedPaymentEndpointRequest request
+        PatchedPaymentEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -177,56 +240,101 @@ PatchedPaymentEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"accounting/v1/payments/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaymentResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaymentResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Payment` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"accounting/v1/payments/meta/patch/{id}"
+                Path = $"accounting/v1/payments/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Payment` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/payments/meta/post"
+                Path = "accounting/v1/payments/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Payments/Requests/PatchedPaymentEndpointRequest.cs b/src/Merge.Client/Accounting/Payments/Requests/PatchedPaymentEndpointRequest.cs
index 10772971..e5938f8e 100644
--- a/src/Merge.Client/Accounting/Payments/Requests/PatchedPaymentEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/Payments/Requests/PatchedPaymentEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class PatchedPaymentEndpointRequest
+public record PatchedPaymentEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PatchedPaymentRequest Model { get; init; }
+    public required PatchedPaymentRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Payments/Requests/PaymentEndpointRequest.cs b/src/Merge.Client/Accounting/Payments/Requests/PaymentEndpointRequest.cs
index 85121305..243ad1e1 100644
--- a/src/Merge.Client/Accounting/Payments/Requests/PaymentEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/Payments/Requests/PaymentEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class PaymentEndpointRequest
+public record PaymentEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PaymentRequest Model { get; init; }
+    public required PaymentRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Payments/Requests/PaymentsListRequest.cs b/src/Merge.Client/Accounting/Payments/Requests/PaymentsListRequest.cs
index 0e9eda2f..83220401 100644
--- a/src/Merge.Client/Accounting/Payments/Requests/PaymentsListRequest.cs
+++ b/src/Merge.Client/Accounting/Payments/Requests/PaymentsListRequest.cs
@@ -1,83 +1,79 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class PaymentsListRequest
+public record PaymentsListRequest
 {
     /// <summary>
     /// If provided, will only return payments for this account.
     /// </summary>
-    public string? AccountId { get; init; }
+    public string? AccountId { get; set; }
 
     /// <summary>
     /// If provided, will only return payments for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return payments for this contact.
     /// </summary>
-    public string? ContactId { get; init; }
+    public string? ContactId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public PaymentsListRequestExpand? Expand { get; init; }
+    public PaymentsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? TransactionDateAfter { get; init; }
+    public DateTime? TransactionDateAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? TransactionDateBefore { get; init; }
+    public DateTime? TransactionDateBefore { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Payments/Requests/PaymentsRetrieveRequest.cs b/src/Merge.Client/Accounting/Payments/Requests/PaymentsRetrieveRequest.cs
index 087d0efe..4fe797f0 100644
--- a/src/Merge.Client/Accounting/Payments/Requests/PaymentsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Payments/Requests/PaymentsRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class PaymentsRetrieveRequest
+public record PaymentsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public PaymentsRetrieveRequestExpand? Expand { get; init; }
+    public PaymentsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Payments/Types/PaymentsListRequestExpand.cs b/src/Merge.Client/Accounting/Payments/Types/PaymentsListRequestExpand.cs
index 977d071e..a99a67eb 100644
--- a/src/Merge.Client/Accounting/Payments/Types/PaymentsListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Payments/Types/PaymentsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Payments/Types/PaymentsRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/Payments/Types/PaymentsRetrieveRequestExpand.cs
index 99bb88a4..5da5f1c2 100644
--- a/src/Merge.Client/Accounting/Payments/Types/PaymentsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Payments/Types/PaymentsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/PhoneNumbers/PhoneNumbersClient.cs b/src/Merge.Client/Accounting/PhoneNumbers/PhoneNumbersClient.cs
index cdc47dfc..202e95da 100644
--- a/src/Merge.Client/Accounting/PhoneNumbers/PhoneNumbersClient.cs
+++ b/src/Merge.Client/Accounting/PhoneNumbers/PhoneNumbersClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -20,7 +20,8 @@ public PhoneNumbersClient(RawClient client)
     /// </summary>
     public async Task<AccountingPhoneNumber> RetrieveAsync(
         string id,
-        PhoneNumbersRetrieveRequest request
+        PhoneNumbersRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -31,16 +32,30 @@ PhoneNumbersRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/phone-numbers/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountingPhoneNumber>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountingPhoneNumber>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/PhoneNumbers/Requests/PhoneNumbersRetrieveRequest.cs b/src/Merge.Client/Accounting/PhoneNumbers/Requests/PhoneNumbersRetrieveRequest.cs
index 944d074d..878ba4bf 100644
--- a/src/Merge.Client/Accounting/PhoneNumbers/Requests/PhoneNumbersRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/PhoneNumbers/Requests/PhoneNumbersRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Accounting;
 
-public class PhoneNumbersRetrieveRequest
+public record PhoneNumbersRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/PurchaseOrders/PurchaseOrdersClient.cs b/src/Merge.Client/Accounting/PurchaseOrders/PurchaseOrdersClient.cs
index 70fafa93..b32c6400 100644
--- a/src/Merge.Client/Accounting/PurchaseOrders/PurchaseOrdersClient.cs
+++ b/src/Merge.Client/Accounting/PurchaseOrders/PurchaseOrdersClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public PurchaseOrdersClient(RawClient client)
     /// <summary>
     /// Returns a list of `PurchaseOrder` objects.
     /// </summary>
-    public async Task<PaginatedPurchaseOrderList> ListAsync(PurchaseOrdersListRequest request)
+    public async Task<PaginatedPurchaseOrderList> ListAsync(
+        PurchaseOrdersListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedPurchaseOrderList> ListAsync(PurchaseOrdersListReques
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,19 +56,27 @@ public async Task<PaginatedPurchaseOrderList> ListAsync(PurchaseOrdersListReques
         }
         if (request.IssueDateAfter != null)
         {
-            _query["issue_date_after"] = request.IssueDateAfter.Value.ToString("o0");
+            _query["issue_date_after"] = request.IssueDateAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.IssueDateBefore != null)
         {
-            _query["issue_date_before"] = request.IssueDateBefore.Value.ToString("o0");
+            _query["issue_date_before"] = request.IssueDateBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -84,23 +97,40 @@ public async Task<PaginatedPurchaseOrderList> ListAsync(PurchaseOrdersListReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/purchase-orders",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedPurchaseOrderList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedPurchaseOrderList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `PurchaseOrder` object with the given values.
     /// </summary>
-    public async Task<PurchaseOrderResponse> CreateAsync(PurchaseOrderEndpointRequest request)
+    public async Task<PurchaseOrderResponse> CreateAsync(
+        PurchaseOrderEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -114,23 +144,41 @@ public async Task<PurchaseOrderResponse> CreateAsync(PurchaseOrderEndpointReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/purchase-orders",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PurchaseOrderResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PurchaseOrderResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `PurchaseOrder` object with the given `id`.
     /// </summary>
-    public async Task<PurchaseOrder> RetrieveAsync(string id, PurchaseOrdersRetrieveRequest request)
+    public async Task<PurchaseOrder> RetrieveAsync(
+        string id,
+        PurchaseOrdersRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -152,36 +200,64 @@ public async Task<PurchaseOrder> RetrieveAsync(string id, PurchaseOrdersRetrieve
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/purchase-orders/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PurchaseOrder>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PurchaseOrder>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `PurchaseOrder` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/purchase-orders/meta/post"
+                Path = "accounting/v1/purchase-orders/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrderEndpointRequest.cs b/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrderEndpointRequest.cs
index 3058eeac..d955e537 100644
--- a/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrderEndpointRequest.cs
+++ b/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrderEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class PurchaseOrderEndpointRequest
+public record PurchaseOrderEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PurchaseOrderRequest Model { get; init; }
+    public required PurchaseOrderRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrdersListRequest.cs b/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrdersListRequest.cs
index 898b44c0..9844f6f4 100644
--- a/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrdersListRequest.cs
+++ b/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrdersListRequest.cs
@@ -1,83 +1,79 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class PurchaseOrdersListRequest
+public record PurchaseOrdersListRequest
 {
     /// <summary>
     /// If provided, will only return purchase orders for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public PurchaseOrdersListRequestExpand? Expand { get; init; }
+    public PurchaseOrdersListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? IssueDateAfter { get; init; }
+    public DateTime? IssueDateAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? IssueDateBefore { get; init; }
+    public DateTime? IssueDateBefore { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrdersRetrieveRequest.cs b/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrdersRetrieveRequest.cs
index 2e2256e5..abdfe499 100644
--- a/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrdersRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/PurchaseOrders/Requests/PurchaseOrdersRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class PurchaseOrdersRetrieveRequest
+public record PurchaseOrdersRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public PurchaseOrdersRetrieveRequestExpand? Expand { get; init; }
+    public PurchaseOrdersRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/PurchaseOrders/Types/PurchaseOrdersListRequestExpand.cs b/src/Merge.Client/Accounting/PurchaseOrders/Types/PurchaseOrdersListRequestExpand.cs
index 359ded3b..28ecabcc 100644
--- a/src/Merge.Client/Accounting/PurchaseOrders/Types/PurchaseOrdersListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/PurchaseOrders/Types/PurchaseOrdersListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/PurchaseOrders/Types/PurchaseOrdersRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/PurchaseOrders/Types/PurchaseOrdersRetrieveRequestExpand.cs
index 40c4066c..a700e7f4 100644
--- a/src/Merge.Client/Accounting/PurchaseOrders/Types/PurchaseOrdersRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/PurchaseOrders/Types/PurchaseOrdersRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/RegenerateKey/RegenerateKeyClient.cs b/src/Merge.Client/Accounting/RegenerateKey/RegenerateKeyClient.cs
index 9e6b0e60..0b47457c 100644
--- a/src/Merge.Client/Accounting/RegenerateKey/RegenerateKeyClient.cs
+++ b/src/Merge.Client/Accounting/RegenerateKey/RegenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public RegenerateKeyClient(RawClient client)
     /// <summary>
     /// Exchange remote keys.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(RemoteKeyForRegenerationRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        RemoteKeyForRegenerationRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/regenerate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs b/src/Merge.Client/Accounting/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
index 16fbf276..6e473f9e 100644
--- a/src/Merge.Client/Accounting/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
+++ b/src/Merge.Client/Accounting/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Accounting;
 
-public class RemoteKeyForRegenerationRequest
+public record RemoteKeyForRegenerationRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Accounting/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
index 324f5fc0..99cf40bf 100644
--- a/src/Merge.Client/Accounting/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Accounting/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class LinkedAccountCommonModelScopeDeserializerRequest
+public record LinkedAccountCommonModelScopeDeserializerRequest
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializerRequest>();
 }
diff --git a/src/Merge.Client/Accounting/Scopes/ScopesClient.cs b/src/Merge.Client/Accounting/Scopes/ScopesClient.cs
index 0750e4ee..9f886a49 100644
--- a/src/Merge.Client/Accounting/Scopes/ScopesClient.cs
+++ b/src/Merge.Client/Accounting/Scopes/ScopesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,63 +18,110 @@ public ScopesClient(RawClient client)
     /// <summary>
     /// Get the default permissions for Merge Common Models and fields across all Linked Accounts of a given category. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/default-scopes"
+                Path = "accounting/v1/default-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all available permissions for Merge Common Models and fields for a single Linked Account. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/linked-account-scopes"
+                Path = "accounting/v1/linked-account-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Update permissions for any Common Model or field for a single Linked Account. Any Scopes not set in this POST request will inherit the default Scopes. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes)
     /// </summary>
     public async Task<CommonModelScopeApi> LinkedAccountScopesCreateAsync(
-        LinkedAccountCommonModelScopeDeserializerRequest request
+        LinkedAccountCommonModelScopeDeserializerRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/linked-account-scopes",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/SyncStatus/Requests/SyncStatusListRequest.cs b/src/Merge.Client/Accounting/SyncStatus/Requests/SyncStatusListRequest.cs
index 9a5b206f..ec6ded18 100644
--- a/src/Merge.Client/Accounting/SyncStatus/Requests/SyncStatusListRequest.cs
+++ b/src/Merge.Client/Accounting/SyncStatus/Requests/SyncStatusListRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Accounting;
 
-public class SyncStatusListRequest
+public record SyncStatusListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/SyncStatus/SyncStatusClient.cs b/src/Merge.Client/Accounting/SyncStatus/SyncStatusClient.cs
index c431be4a..f95c9375 100644
--- a/src/Merge.Client/Accounting/SyncStatus/SyncStatusClient.cs
+++ b/src/Merge.Client/Accounting/SyncStatus/SyncStatusClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public SyncStatusClient(RawClient client)
     /// <summary>
     /// Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `PARTIALLY_SYNCED`, `PAUSED`, `SYNCING`. Learn more about sync status in our [Help Center](https://help.merge.dev/en/articles/8184193-merge-sync-statuses).
     /// </summary>
-    public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest request)
+    public async Task<PaginatedSyncStatusList> ListAsync(
+        SyncStatusListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -32,16 +35,30 @@ public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest reque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/sync-status",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedSyncStatusList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedSyncStatusList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/TaxRates/Requests/TaxRatesListRequest.cs b/src/Merge.Client/Accounting/TaxRates/Requests/TaxRatesListRequest.cs
index 6e83cdc8..7a5e16b6 100644
--- a/src/Merge.Client/Accounting/TaxRates/Requests/TaxRatesListRequest.cs
+++ b/src/Merge.Client/Accounting/TaxRates/Requests/TaxRatesListRequest.cs
@@ -1,59 +1,59 @@
 namespace Merge.Client.Accounting;
 
-public class TaxRatesListRequest
+public record TaxRatesListRequest
 {
     /// <summary>
     /// If provided, will only return tax rates for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/TaxRates/Requests/TaxRatesRetrieveRequest.cs b/src/Merge.Client/Accounting/TaxRates/Requests/TaxRatesRetrieveRequest.cs
index c866feb4..5572dc83 100644
--- a/src/Merge.Client/Accounting/TaxRates/Requests/TaxRatesRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/TaxRates/Requests/TaxRatesRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Accounting;
 
-public class TaxRatesRetrieveRequest
+public record TaxRatesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/TaxRates/TaxRatesClient.cs b/src/Merge.Client/Accounting/TaxRates/TaxRatesClient.cs
index f1019f96..c8460518 100644
--- a/src/Merge.Client/Accounting/TaxRates/TaxRatesClient.cs
+++ b/src/Merge.Client/Accounting/TaxRates/TaxRatesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public TaxRatesClient(RawClient client)
     /// <summary>
     /// Returns a list of `TaxRate` objects.
     /// </summary>
-    public async Task<PaginatedTaxRateList> ListAsync(TaxRatesListRequest request)
+    public async Task<PaginatedTaxRateList> ListAsync(
+        TaxRatesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedTaxRateList> ListAsync(TaxRatesListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedTaxRateList> ListAsync(TaxRatesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -68,23 +77,41 @@ public async Task<PaginatedTaxRateList> ListAsync(TaxRatesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/tax-rates",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTaxRateList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTaxRateList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `TaxRate` object with the given `id`.
     /// </summary>
-    public async Task<TaxRate> RetrieveAsync(string id, TaxRatesRetrieveRequest request)
+    public async Task<TaxRate> RetrieveAsync(
+        string id,
+        TaxRatesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -98,16 +125,30 @@ public async Task<TaxRate> RetrieveAsync(string id, TaxRatesRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/tax-rates/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TaxRate>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TaxRate>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/TrackingCategories/Requests/TrackingCategoriesListRequest.cs b/src/Merge.Client/Accounting/TrackingCategories/Requests/TrackingCategoriesListRequest.cs
index 93cf69c4..8818b9e2 100644
--- a/src/Merge.Client/Accounting/TrackingCategories/Requests/TrackingCategoriesListRequest.cs
+++ b/src/Merge.Client/Accounting/TrackingCategories/Requests/TrackingCategoriesListRequest.cs
@@ -1,69 +1,69 @@
 namespace Merge.Client.Accounting;
 
-public class TrackingCategoriesListRequest
+public record TrackingCategoriesListRequest
 {
     /// <summary>
     /// If provided, will only return tracking categories for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/TrackingCategories/Requests/TrackingCategoriesRetrieveRequest.cs b/src/Merge.Client/Accounting/TrackingCategories/Requests/TrackingCategoriesRetrieveRequest.cs
index 59c36c19..51c05160 100644
--- a/src/Merge.Client/Accounting/TrackingCategories/Requests/TrackingCategoriesRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/TrackingCategories/Requests/TrackingCategoriesRetrieveRequest.cs
@@ -1,24 +1,24 @@
 namespace Merge.Client.Accounting;
 
-public class TrackingCategoriesRetrieveRequest
+public record TrackingCategoriesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/TrackingCategories/TrackingCategoriesClient.cs b/src/Merge.Client/Accounting/TrackingCategories/TrackingCategoriesClient.cs
index 70f03ece..4748e61b 100644
--- a/src/Merge.Client/Accounting/TrackingCategories/TrackingCategoriesClient.cs
+++ b/src/Merge.Client/Accounting/TrackingCategories/TrackingCategoriesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,7 +19,8 @@ public TrackingCategoriesClient(RawClient client)
     /// Returns a list of `TrackingCategory` objects.
     /// </summary>
     public async Task<PaginatedTrackingCategoryList> ListAsync(
-        TrackingCategoriesListRequest request
+        TrackingCategoriesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -29,11 +30,13 @@ TrackingCategoriesListRequest request
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -53,11 +56,15 @@ TrackingCategoriesListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -78,17 +85,31 @@ TrackingCategoriesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/tracking-categories",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTrackingCategoryList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTrackingCategoryList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -96,7 +117,8 @@ TrackingCategoriesListRequest request
     /// </summary>
     public async Task<TrackingCategory> RetrieveAsync(
         string id,
-        TrackingCategoriesRetrieveRequest request
+        TrackingCategoriesRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -119,16 +141,30 @@ TrackingCategoriesRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/tracking-categories/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TrackingCategory>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TrackingCategory>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Transactions/Requests/TransactionsListRequest.cs b/src/Merge.Client/Accounting/Transactions/Requests/TransactionsListRequest.cs
index 9d55ed25..2c30363b 100644
--- a/src/Merge.Client/Accounting/Transactions/Requests/TransactionsListRequest.cs
+++ b/src/Merge.Client/Accounting/Transactions/Requests/TransactionsListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class TransactionsListRequest
+public record TransactionsListRequest
 {
     /// <summary>
     /// If provided, will only return accounting transactions for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TransactionsListRequestExpand? Expand { get; init; }
+    public TransactionsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? TransactionDateAfter { get; init; }
+    public DateTime? TransactionDateAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? TransactionDateBefore { get; init; }
+    public DateTime? TransactionDateBefore { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Transactions/Requests/TransactionsRetrieveRequest.cs b/src/Merge.Client/Accounting/Transactions/Requests/TransactionsRetrieveRequest.cs
index c7419abb..cf27597a 100644
--- a/src/Merge.Client/Accounting/Transactions/Requests/TransactionsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/Transactions/Requests/TransactionsRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class TransactionsRetrieveRequest
+public record TransactionsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TransactionsRetrieveRequestExpand? Expand { get; init; }
+    public TransactionsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Transactions/TransactionsClient.cs b/src/Merge.Client/Accounting/Transactions/TransactionsClient.cs
index 60c67187..08c7618d 100644
--- a/src/Merge.Client/Accounting/Transactions/TransactionsClient.cs
+++ b/src/Merge.Client/Accounting/Transactions/TransactionsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public TransactionsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Transaction` objects.
     /// </summary>
-    public async Task<PaginatedTransactionList> ListAsync(TransactionsListRequest request)
+    public async Task<PaginatedTransactionList> ListAsync(
+        TransactionsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedTransactionList> ListAsync(TransactionsListRequest re
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedTransactionList> ListAsync(TransactionsListRequest re
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -67,32 +76,54 @@ public async Task<PaginatedTransactionList> ListAsync(TransactionsListRequest re
         }
         if (request.TransactionDateAfter != null)
         {
-            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString("o0");
+            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.TransactionDateBefore != null)
         {
-            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString("o0");
+            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/transactions",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTransactionList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTransactionList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Transaction` object with the given `id`.
     /// </summary>
-    public async Task<Transaction> RetrieveAsync(string id, TransactionsRetrieveRequest request)
+    public async Task<Transaction> RetrieveAsync(
+        string id,
+        TransactionsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -106,16 +137,30 @@ public async Task<Transaction> RetrieveAsync(string id, TransactionsRetrieveRequ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/transactions/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Transaction>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Transaction>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/Transactions/Types/TransactionsListRequestExpand.cs b/src/Merge.Client/Accounting/Transactions/Types/TransactionsListRequestExpand.cs
index 36261437..6ba5ec5a 100644
--- a/src/Merge.Client/Accounting/Transactions/Types/TransactionsListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Transactions/Types/TransactionsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Transactions/Types/TransactionsRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/Transactions/Types/TransactionsRetrieveRequestExpand.cs
index 7c35037b..372d78d0 100644
--- a/src/Merge.Client/Accounting/Transactions/Types/TransactionsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/Transactions/Types/TransactionsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/Account.cs b/src/Merge.Client/Accounting/Types/Account.cs
index 8cf0c4f9..2732d710 100644
--- a/src/Merge.Client/Accounting/Types/Account.cs
+++ b/src/Merge.Client/Accounting/Types/Account.cs
@@ -1,44 +1,43 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class Account
+public record Account
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The account's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The account's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The account's broadest grouping.
@@ -50,13 +49,13 @@ public class Account
     /// - `REVENUE` - REVENUE
     /// </summary>
     [JsonPropertyName("classification")]
-    public ClassificationEnum? Classification { get; init; }
+    public ClassificationEnum? Classification { get; set; }
 
     /// <summary>
     /// The account's type is a narrower and more specific grouping within the account's classification.
     /// </summary>
     [JsonPropertyName("type")]
-    public string? Type { get; init; }
+    public string? Type { get; set; }
 
     /// <summary>
     /// The account's status.
@@ -66,13 +65,13 @@ public class Account
     /// - `INACTIVE` - INACTIVE
     /// </summary>
     [JsonPropertyName("status")]
-    public AccountStatusEnum? Status { get; init; }
+    public AccountStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The account's current balance.
     /// </summary>
     [JsonPropertyName("current_balance")]
-    public double? CurrentBalance { get; init; }
+    public double? CurrentBalance { get; set; }
 
     /// <summary>
     /// The account's currency.
@@ -385,35 +384,35 @@ public class Account
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The account's number.
     /// </summary>
     [JsonPropertyName("account_number")]
-    public string? AccountNumber { get; init; }
+    public string? AccountNumber { get; set; }
 
     /// <summary>
     /// ID of the parent account.
     /// </summary>
     [JsonPropertyName("parent_account")]
-    public string? ParentAccount { get; init; }
+    public string? ParentAccount { get; set; }
 
     /// <summary>
     /// The company the account belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountDetails.cs b/src/Merge.Client/Accounting/Types/AccountDetails.cs
index 718f2978..75c0b23f 100644
--- a/src/Merge.Client/Accounting/Types/AccountDetails.cs
+++ b/src/Merge.Client/Accounting/Types/AccountDetails.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountDetails
+public record AccountDetails
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     [JsonPropertyName("integration_slug")]
-    public string? IntegrationSlug { get; init; }
+    public string? IntegrationSlug { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     [JsonPropertyName("status")]
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string? WebhookListenerUrl { get; init; }
+    public string? WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string? AccountType { get; init; }
+    public string? AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountDetailsAndActions.cs b/src/Merge.Client/Accounting/Types/AccountDetailsAndActions.cs
index 2a84a46e..70ddfc91 100644
--- a/src/Merge.Client/Accounting/Types/AccountDetailsAndActions.cs
+++ b/src/Merge.Client/Accounting/Types/AccountDetailsAndActions.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountDetailsAndActions
+public record AccountDetailsAndActions
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("status")]
-    public AccountDetailsAndActionsStatusEnum Status { get; init; }
+    public required AccountDetailsAndActionsStatusEnum Status { get; set; }
 
     [JsonPropertyName("status_detail")]
-    public string? StatusDetail { get; init; }
+    public string? StatusDetail { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// The tenant or domain the customer has provided access to.
     /// </summary>
     [JsonPropertyName("subdomain")]
-    public string? Subdomain { get; init; }
+    public string? Subdomain { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string WebhookListenerUrl { get; init; }
+    public required string WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountDetailsAndActionsIntegration? Integration { get; init; }
+    public AccountDetailsAndActionsIntegration? Integration { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string AccountType { get; init; }
+    public required string AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountDetailsAndActionsIntegration.cs b/src/Merge.Client/Accounting/Types/AccountDetailsAndActionsIntegration.cs
index 9821c68f..5f430f77 100644
--- a/src/Merge.Client/Accounting/Types/AccountDetailsAndActionsIntegration.cs
+++ b/src/Merge.Client/Accounting/Types/AccountDetailsAndActionsIntegration.cs
@@ -1,33 +1,32 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountDetailsAndActionsIntegration
+public record AccountDetailsAndActionsIntegration
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     [JsonPropertyName("color")]
-    public string Color { get; init; }
+    public required string Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string Slug { get; init; }
+    public required string Slug { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountDetailsAndActionsStatusEnum.cs b/src/Merge.Client/Accounting/Types/AccountDetailsAndActionsStatusEnum.cs
index 814a0e43..815593fe 100644
--- a/src/Merge.Client/Accounting/Types/AccountDetailsAndActionsStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/AccountDetailsAndActionsStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/AccountIntegration.cs b/src/Merge.Client/Accounting/Types/AccountIntegration.cs
index 68ee44e9..06942e93 100644
--- a/src/Merge.Client/Accounting/Types/AccountIntegration.cs
+++ b/src/Merge.Client/Accounting/Types/AccountIntegration.cs
@@ -1,60 +1,59 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountIntegration
+public record AccountIntegration
 {
     /// <summary>
     /// Company name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// Category or categories this integration belongs to. Multiple categories should be comma separated, i.e. [ats, hris].
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum>? Categories { get; init; }
+    public IEnumerable<CategoriesEnum>? Categories { get; set; }
 
     /// <summary>
     /// Company logo in rectangular shape. <b>Upload an image with a clear background.</b>
     /// </summary>
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     /// <summary>
     /// Company logo in square shape. <b>Upload an image with a white background.</b>
     /// </summary>
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     /// <summary>
     /// The color of this integration used for buttons and text throughout the app and landing pages. <b>Choose a darker, saturated color.</b>
     /// </summary>
     [JsonPropertyName("color")]
-    public string? Color { get; init; }
+    public string? Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string? Slug { get; init; }
+    public string? Slug { get; set; }
 
     /// <summary>
     /// Mapping of API endpoints to documentation urls for support. Example: {'GET': [['/common-model-scopes', 'https://docs.merge.dev/accounting/common-model-scopes/#common_model_scopes_retrieve'],['/common-model-actions', 'https://docs.merge.dev/accounting/common-model-actions/#common_model_actions_retrieve']], 'POST': []}
     /// </summary>
     [JsonPropertyName("api_endpoints_to_documentation_urls")]
-    public Dictionary<string, object>? ApiEndpointsToDocumentationUrls { get; init; }
+    public Dictionary<string, object?>? ApiEndpointsToDocumentationUrls { get; set; }
 
     /// <summary>
     /// Setup guide URL for third party webhook creation. Exposed in Merge Docs.
     /// </summary>
     [JsonPropertyName("webhook_setup_guide_url")]
-    public string? WebhookSetupGuideUrl { get; init; }
+    public string? WebhookSetupGuideUrl { get; set; }
 
     /// <summary>
     /// Category or categories this integration is in beta status for.
     /// </summary>
     [JsonPropertyName("category_beta_status")]
-    public Dictionary<string, object>? CategoryBetaStatus { get; init; }
+    public Dictionary<string, object?>? CategoryBetaStatus { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountRequest.cs b/src/Merge.Client/Accounting/Types/AccountRequest.cs
index 7b7e4910..05776440 100644
--- a/src/Merge.Client/Accounting/Types/AccountRequest.cs
+++ b/src/Merge.Client/Accounting/Types/AccountRequest.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountRequest
+public record AccountRequest
 {
     /// <summary>
     /// The account's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The account's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The account's broadest grouping.
@@ -29,13 +28,13 @@ public class AccountRequest
     /// - `REVENUE` - REVENUE
     /// </summary>
     [JsonPropertyName("classification")]
-    public ClassificationEnum? Classification { get; init; }
+    public ClassificationEnum? Classification { get; set; }
 
     /// <summary>
     /// The account's type is a narrower and more specific grouping within the account's classification.
     /// </summary>
     [JsonPropertyName("type")]
-    public string? Type { get; init; }
+    public string? Type { get; set; }
 
     /// <summary>
     /// The account's status.
@@ -45,13 +44,13 @@ public class AccountRequest
     /// - `INACTIVE` - INACTIVE
     /// </summary>
     [JsonPropertyName("status")]
-    public AccountStatusEnum? Status { get; init; }
+    public AccountStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The account's current balance.
     /// </summary>
     [JsonPropertyName("current_balance")]
-    public double? CurrentBalance { get; init; }
+    public double? CurrentBalance { get; set; }
 
     /// <summary>
     /// The account's currency.
@@ -364,29 +363,29 @@ public class AccountRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The account's number.
     /// </summary>
     [JsonPropertyName("account_number")]
-    public string? AccountNumber { get; init; }
+    public string? AccountNumber { get; set; }
 
     /// <summary>
     /// ID of the parent account.
     /// </summary>
     [JsonPropertyName("parent_account")]
-    public string? ParentAccount { get; init; }
+    public string? ParentAccount { get; set; }
 
     /// <summary>
     /// The company the account belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountResponse.cs b/src/Merge.Client/Accounting/Types/AccountResponse.cs
index ec551661..9a98ec02 100644
--- a/src/Merge.Client/Accounting/Types/AccountResponse.cs
+++ b/src/Merge.Client/Accounting/Types/AccountResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountResponse
+public record AccountResponse
 {
     [JsonPropertyName("model")]
-    public Account Model { get; init; }
+    public required Account Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountStatusEnum.cs b/src/Merge.Client/Accounting/Types/AccountStatusEnum.cs
index 6ab9d6cc..3fca0796 100644
--- a/src/Merge.Client/Accounting/Types/AccountStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/AccountStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/AccountToken.cs b/src/Merge.Client/Accounting/Types/AccountToken.cs
index c180ce6e..f92e11ae 100644
--- a/src/Merge.Client/Accounting/Types/AccountToken.cs
+++ b/src/Merge.Client/Accounting/Types/AccountToken.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountToken
+public record AccountToken
 {
     [JsonPropertyName("account_token")]
-    public string AccountToken_ { get; init; }
+    public required string AccountToken_ { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountingAttachment.cs b/src/Merge.Client/Accounting/Types/AccountingAttachment.cs
index abbb40f9..c040b401 100644
--- a/src/Merge.Client/Accounting/Types/AccountingAttachment.cs
+++ b/src/Merge.Client/Accounting/Types/AccountingAttachment.cs
@@ -1,60 +1,59 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountingAttachment
+public record AccountingAttachment
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The attachment's name.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The attachment's url.
     /// </summary>
     [JsonPropertyName("file_url")]
-    public string? FileUrl { get; init; }
+    public string? FileUrl { get; set; }
 
     /// <summary>
     /// The company the accounting attachment belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountingAttachmentRequest.cs b/src/Merge.Client/Accounting/Types/AccountingAttachmentRequest.cs
index 4084a447..a4702a32 100644
--- a/src/Merge.Client/Accounting/Types/AccountingAttachmentRequest.cs
+++ b/src/Merge.Client/Accounting/Types/AccountingAttachmentRequest.cs
@@ -4,29 +4,29 @@
 
 namespace Merge.Client.Accounting;
 
-public class AccountingAttachmentRequest
+public record AccountingAttachmentRequest
 {
     /// <summary>
     /// The attachment's name.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The attachment's url.
     /// </summary>
     [JsonPropertyName("file_url")]
-    public string? FileUrl { get; init; }
+    public string? FileUrl { get; set; }
 
     /// <summary>
     /// The company the accounting attachment belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountingAttachmentResponse.cs b/src/Merge.Client/Accounting/Types/AccountingAttachmentResponse.cs
index 0192807e..3e3eb3d3 100644
--- a/src/Merge.Client/Accounting/Types/AccountingAttachmentResponse.cs
+++ b/src/Merge.Client/Accounting/Types/AccountingAttachmentResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountingAttachmentResponse
+public record AccountingAttachmentResponse
 {
     [JsonPropertyName("model")]
-    public AccountingAttachment Model { get; init; }
+    public required AccountingAttachment Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountingPeriod.cs b/src/Merge.Client/Accounting/Types/AccountingPeriod.cs
index 28f45471..03cd27ab 100644
--- a/src/Merge.Client/Accounting/Types/AccountingPeriod.cs
+++ b/src/Merge.Client/Accounting/Types/AccountingPeriod.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AccountingPeriod
+public record AccountingPeriod
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// Beginning date of the period
     /// </summary>
     [JsonPropertyName("start_date")]
-    public DateTime? StartDate { get; init; }
+    public DateTime? StartDate { get; set; }
 
     /// <summary>
     /// End date of the period
     /// </summary>
     [JsonPropertyName("end_date")]
-    public DateTime? EndDate { get; init; }
+    public DateTime? EndDate { get; set; }
 
     [JsonPropertyName("status")]
-    public AccountingPeriodStatusEnum? Status { get; init; }
+    public AccountingPeriodStatusEnum? Status { get; set; }
 
     /// <summary>
     /// Name of the accounting period.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountingPeriodStatusEnum.cs b/src/Merge.Client/Accounting/Types/AccountingPeriodStatusEnum.cs
index 83fabffe..993e313b 100644
--- a/src/Merge.Client/Accounting/Types/AccountingPeriodStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/AccountingPeriodStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/AccountingPhoneNumber.cs b/src/Merge.Client/Accounting/Types/AccountingPhoneNumber.cs
index bb31731d..ca9722b6 100644
--- a/src/Merge.Client/Accounting/Types/AccountingPhoneNumber.cs
+++ b/src/Merge.Client/Accounting/Types/AccountingPhoneNumber.cs
@@ -4,29 +4,29 @@
 
 namespace Merge.Client.Accounting;
 
-public class AccountingPhoneNumber
+public record AccountingPhoneNumber
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The phone number.
     /// </summary>
     [JsonPropertyName("number")]
-    public string? Number { get; init; }
+    public string? Number { get; set; }
 
     /// <summary>
     /// The phone number's type.
     /// </summary>
     [JsonPropertyName("type")]
-    public string? Type { get; init; }
+    public string? Type { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AccountingPhoneNumberRequest.cs b/src/Merge.Client/Accounting/Types/AccountingPhoneNumberRequest.cs
index aa8b6782..1fcd72c1 100644
--- a/src/Merge.Client/Accounting/Types/AccountingPhoneNumberRequest.cs
+++ b/src/Merge.Client/Accounting/Types/AccountingPhoneNumberRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Accounting;
 
-public class AccountingPhoneNumberRequest
+public record AccountingPhoneNumberRequest
 {
     /// <summary>
     /// The phone number.
     /// </summary>
     [JsonPropertyName("number")]
-    public string? Number { get; init; }
+    public string? Number { get; set; }
 
     /// <summary>
     /// The phone number's type.
     /// </summary>
     [JsonPropertyName("type")]
-    public string? Type { get; init; }
+    public string? Type { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/Address.cs b/src/Merge.Client/Accounting/Types/Address.cs
index 3094bd65..068e5bf6 100644
--- a/src/Merge.Client/Accounting/Types/Address.cs
+++ b/src/Merge.Client/Accounting/Types/Address.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class Address
+public record Address
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The address type.
@@ -26,34 +25,34 @@ public class Address
     /// - `SHIPPING` - SHIPPING
     /// </summary>
     [JsonPropertyName("type")]
-    public AddressTypeEnum? Type { get; init; }
+    public AddressTypeEnum? Type { get; set; }
 
     /// <summary>
     /// Line 1 of the address's street.
     /// </summary>
     [JsonPropertyName("street_1")]
-    public string? Street1 { get; init; }
+    public string? Street1 { get; set; }
 
     /// <summary>
     /// Line 2 of the address's street.
     /// </summary>
     [JsonPropertyName("street_2")]
-    public string? Street2 { get; init; }
+    public string? Street2 { get; set; }
 
     /// <summary>
     /// The address's city.
     /// </summary>
     [JsonPropertyName("city")]
-    public string? City { get; init; }
+    public string? City { get; set; }
 
     [JsonPropertyName("state")]
-    public object? State { get; init; }
+    public object? State { get; set; }
 
     /// <summary>
     /// The address's state or region.
     /// </summary>
     [JsonPropertyName("country_subdivision")]
-    public string? CountrySubdivision { get; init; }
+    public string? CountrySubdivision { get; set; }
 
     /// <summary>
     /// The address's country.
@@ -309,11 +308,11 @@ public class Address
     /// - `ZW` - Zimbabwe
     /// </summary>
     [JsonPropertyName("country")]
-    public CountryEnum? Country { get; init; }
+    public CountryEnum? Country { get; set; }
 
     /// <summary>
     /// The address's zip code.
     /// </summary>
     [JsonPropertyName("zip_code")]
-    public string? ZipCode { get; init; }
+    public string? ZipCode { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AddressRequest.cs b/src/Merge.Client/Accounting/Types/AddressRequest.cs
index 4944ae3f..7985d935 100644
--- a/src/Merge.Client/Accounting/Types/AddressRequest.cs
+++ b/src/Merge.Client/Accounting/Types/AddressRequest.cs
@@ -1,11 +1,10 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AddressRequest
+public record AddressRequest
 {
     /// <summary>
     /// The address type.
@@ -14,31 +13,31 @@ public class AddressRequest
     /// - `SHIPPING` - SHIPPING
     /// </summary>
     [JsonPropertyName("type")]
-    public AddressTypeEnum? Type { get; init; }
+    public AddressTypeEnum? Type { get; set; }
 
     /// <summary>
     /// Line 1 of the address's street.
     /// </summary>
     [JsonPropertyName("street_1")]
-    public string? Street1 { get; init; }
+    public string? Street1 { get; set; }
 
     /// <summary>
     /// Line 2 of the address's street.
     /// </summary>
     [JsonPropertyName("street_2")]
-    public string? Street2 { get; init; }
+    public string? Street2 { get; set; }
 
     /// <summary>
     /// The address's city.
     /// </summary>
     [JsonPropertyName("city")]
-    public string? City { get; init; }
+    public string? City { get; set; }
 
     /// <summary>
     /// The address's state or region.
     /// </summary>
     [JsonPropertyName("country_subdivision")]
-    public string? CountrySubdivision { get; init; }
+    public string? CountrySubdivision { get; set; }
 
     /// <summary>
     /// The address's country.
@@ -294,17 +293,17 @@ public class AddressRequest
     /// - `ZW` - Zimbabwe
     /// </summary>
     [JsonPropertyName("country")]
-    public CountryEnum? Country { get; init; }
+    public CountryEnum? Country { get; set; }
 
     /// <summary>
     /// The address's zip code.
     /// </summary>
     [JsonPropertyName("zip_code")]
-    public string? ZipCode { get; init; }
+    public string? ZipCode { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AddressTypeEnum.cs b/src/Merge.Client/Accounting/Types/AddressTypeEnum.cs
index 8fb5ef65..69754762 100644
--- a/src/Merge.Client/Accounting/Types/AddressTypeEnum.cs
+++ b/src/Merge.Client/Accounting/Types/AddressTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/AdvancedMetadata.cs b/src/Merge.Client/Accounting/Types/AdvancedMetadata.cs
index a323e1e7..f2a76420 100644
--- a/src/Merge.Client/Accounting/Types/AdvancedMetadata.cs
+++ b/src/Merge.Client/Accounting/Types/AdvancedMetadata.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Accounting;
 
-public class AdvancedMetadata
+public record AdvancedMetadata
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("is_custom")]
-    public bool? IsCustom { get; init; }
+    public bool? IsCustom { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<object>? FieldChoices { get; init; }
+    public IEnumerable<object>? FieldChoices { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AsyncPassthroughReciept.cs b/src/Merge.Client/Accounting/Types/AsyncPassthroughReciept.cs
index 8ff5ed36..3eb061ad 100644
--- a/src/Merge.Client/Accounting/Types/AsyncPassthroughReciept.cs
+++ b/src/Merge.Client/Accounting/Types/AsyncPassthroughReciept.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Accounting;
 
-public class AsyncPassthroughReciept
+public record AsyncPassthroughReciept
 {
     [JsonPropertyName("async_passthrough_receipt_id")]
-    public string AsyncPassthroughReceiptId { get; init; }
+    public required string AsyncPassthroughReceiptId { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AuditLogEvent.cs b/src/Merge.Client/Accounting/Types/AuditLogEvent.cs
index 72077ded..e69d4ce4 100644
--- a/src/Merge.Client/Accounting/Types/AuditLogEvent.cs
+++ b/src/Merge.Client/Accounting/Types/AuditLogEvent.cs
@@ -1,26 +1,25 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AuditLogEvent
+public record AuditLogEvent
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The User's full name at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_name")]
-    public string? UserName { get; init; }
+    public string? UserName { get; set; }
 
     /// <summary>
     /// The User's email at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_email")]
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 
     /// <summary>
     /// Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.
@@ -33,10 +32,10 @@ public class AuditLogEvent
     /// - `MERGE_TEAM` - MERGE_TEAM
     /// </summary>
     [JsonPropertyName("role")]
-    public RoleEnum Role { get; init; }
+    public required RoleEnum Role { get; set; }
 
     [JsonPropertyName("ip_address")]
-    public string IpAddress { get; init; }
+    public required string IpAddress { get; set; }
 
     /// <summary>
     /// Designates the type of event that occurred.
@@ -80,11 +79,11 @@ public class AuditLogEvent
     /// - `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED
     /// </summary>
     [JsonPropertyName("event_type")]
-    public EventTypeEnum EventType { get; init; }
+    public required EventTypeEnum EventType { get; set; }
 
     [JsonPropertyName("event_description")]
-    public string EventDescription { get; init; }
+    public required string EventDescription { get; set; }
 
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/AvailableActions.cs b/src/Merge.Client/Accounting/Types/AvailableActions.cs
index 18e92475..afb31c5d 100644
--- a/src/Merge.Client/Accounting/Types/AvailableActions.cs
+++ b/src/Merge.Client/Accounting/Types/AvailableActions.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class AvailableActions
+public record AvailableActions
 {
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/BalanceSheet.cs b/src/Merge.Client/Accounting/Types/BalanceSheet.cs
index 63ffa446..b9db0669 100644
--- a/src/Merge.Client/Accounting/Types/BalanceSheet.cs
+++ b/src/Merge.Client/Accounting/Types/BalanceSheet.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,34 +6,34 @@
 
 namespace Merge.Client.Accounting;
 
-public class BalanceSheet
+public record BalanceSheet
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The balance sheet's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The balance sheet's currency.
@@ -347,51 +346,51 @@ public class BalanceSheet
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// `Company` object for the given `BalanceSheet` object.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The balance sheet's date. The balance sheet data will reflect the company's financial position this point in time.
     /// </summary>
     [JsonPropertyName("date")]
-    public DateTime? Date { get; init; }
+    public DateTime? Date { get; set; }
 
     /// <summary>
     /// The balance sheet's net assets.
     /// </summary>
     [JsonPropertyName("net_assets")]
-    public double? NetAssets { get; init; }
+    public double? NetAssets { get; set; }
 
     [JsonPropertyName("assets")]
-    public IEnumerable<ReportItem>? Assets { get; init; }
+    public IEnumerable<ReportItem>? Assets { get; set; }
 
     [JsonPropertyName("liabilities")]
-    public IEnumerable<ReportItem>? Liabilities { get; init; }
+    public IEnumerable<ReportItem>? Liabilities { get; set; }
 
     [JsonPropertyName("equity")]
-    public IEnumerable<ReportItem>? Equity { get; init; }
+    public IEnumerable<ReportItem>? Equity { get; set; }
 
     /// <summary>
     /// The time that balance sheet was generated by the accounting system.
     /// </summary>
     [JsonPropertyName("remote_generated_at")]
-    public DateTime? RemoteGeneratedAt { get; init; }
+    public DateTime? RemoteGeneratedAt { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/CashFlowStatement.cs b/src/Merge.Client/Accounting/Types/CashFlowStatement.cs
index 799c6389..5550fd2f 100644
--- a/src/Merge.Client/Accounting/Types/CashFlowStatement.cs
+++ b/src/Merge.Client/Accounting/Types/CashFlowStatement.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,34 +6,34 @@
 
 namespace Merge.Client.Accounting;
 
-public class CashFlowStatement
+public record CashFlowStatement
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The cash flow statement's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The cash flow statement's currency.
@@ -347,63 +346,63 @@ public class CashFlowStatement
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The company the cash flow statement belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The cash flow statement's start period.
     /// </summary>
     [JsonPropertyName("start_period")]
-    public DateTime? StartPeriod { get; init; }
+    public DateTime? StartPeriod { get; set; }
 
     /// <summary>
     /// The cash flow statement's end period.
     /// </summary>
     [JsonPropertyName("end_period")]
-    public DateTime? EndPeriod { get; init; }
+    public DateTime? EndPeriod { get; set; }
 
     /// <summary>
     /// Cash and cash equivalents at the beginning of the cash flow statement's period.
     /// </summary>
     [JsonPropertyName("cash_at_beginning_of_period")]
-    public double? CashAtBeginningOfPeriod { get; init; }
+    public double? CashAtBeginningOfPeriod { get; set; }
 
     /// <summary>
     /// Cash and cash equivalents at the beginning of the cash flow statement's period.
     /// </summary>
     [JsonPropertyName("cash_at_end_of_period")]
-    public double? CashAtEndOfPeriod { get; init; }
+    public double? CashAtEndOfPeriod { get; set; }
 
     [JsonPropertyName("operating_activities")]
-    public IEnumerable<ReportItem>? OperatingActivities { get; init; }
+    public IEnumerable<ReportItem>? OperatingActivities { get; set; }
 
     [JsonPropertyName("investing_activities")]
-    public IEnumerable<ReportItem>? InvestingActivities { get; init; }
+    public IEnumerable<ReportItem>? InvestingActivities { get; set; }
 
     [JsonPropertyName("financing_activities")]
-    public IEnumerable<ReportItem>? FinancingActivities { get; init; }
+    public IEnumerable<ReportItem>? FinancingActivities { get; set; }
 
     /// <summary>
     /// The time that cash flow statement was generated by the accounting system.
     /// </summary>
     [JsonPropertyName("remote_generated_at")]
-    public DateTime? RemoteGeneratedAt { get; init; }
+    public DateTime? RemoteGeneratedAt { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/CategoriesEnum.cs b/src/Merge.Client/Accounting/Types/CategoriesEnum.cs
index 429c9522..78b24749 100644
--- a/src/Merge.Client/Accounting/Types/CategoriesEnum.cs
+++ b/src/Merge.Client/Accounting/Types/CategoriesEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/CategoryEnum.cs b/src/Merge.Client/Accounting/Types/CategoryEnum.cs
index c6f4ae7a..0e13574a 100644
--- a/src/Merge.Client/Accounting/Types/CategoryEnum.cs
+++ b/src/Merge.Client/Accounting/Types/CategoryEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/CategoryTypeEnum.cs b/src/Merge.Client/Accounting/Types/CategoryTypeEnum.cs
index f1114711..b2e7dc00 100644
--- a/src/Merge.Client/Accounting/Types/CategoryTypeEnum.cs
+++ b/src/Merge.Client/Accounting/Types/CategoryTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/ClassificationEnum.cs b/src/Merge.Client/Accounting/Types/ClassificationEnum.cs
index 74fe62db..5a52ce96 100644
--- a/src/Merge.Client/Accounting/Types/ClassificationEnum.cs
+++ b/src/Merge.Client/Accounting/Types/ClassificationEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/CommonModelScopeApi.cs b/src/Merge.Client/Accounting/Types/CommonModelScopeApi.cs
index 2fe5de03..c346c8dc 100644
--- a/src/Merge.Client/Accounting/Types/CommonModelScopeApi.cs
+++ b/src/Merge.Client/Accounting/Types/CommonModelScopeApi.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class CommonModelScopeApi
+public record CommonModelScopeApi
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializer>();
 }
diff --git a/src/Merge.Client/Accounting/Types/CommonModelScopesBodyRequest.cs b/src/Merge.Client/Accounting/Types/CommonModelScopesBodyRequest.cs
index 4ed719b7..337e29a4 100644
--- a/src/Merge.Client/Accounting/Types/CommonModelScopesBodyRequest.cs
+++ b/src/Merge.Client/Accounting/Types/CommonModelScopesBodyRequest.cs
@@ -1,18 +1,18 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class CommonModelScopesBodyRequest
+public record CommonModelScopesBodyRequest
 {
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("enabled_actions")]
-    public IEnumerable<EnabledActionsEnum> EnabledActions { get; init; }
+    public IEnumerable<EnabledActionsEnum> EnabledActions { get; set; } =
+        new List<EnabledActionsEnum>();
 
     [JsonPropertyName("disabled_fields")]
-    public IEnumerable<string> DisabledFields { get; init; }
+    public IEnumerable<string> DisabledFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Accounting/Types/CompanyInfo.cs b/src/Merge.Client/Accounting/Types/CompanyInfo.cs
index 932f644a..c507a5ed 100644
--- a/src/Merge.Client/Accounting/Types/CompanyInfo.cs
+++ b/src/Merge.Client/Accounting/Types/CompanyInfo.cs
@@ -1,62 +1,61 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class CompanyInfo
+public record CompanyInfo
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The company's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The company's legal name.
     /// </summary>
     [JsonPropertyName("legal_name")]
-    public string? LegalName { get; init; }
+    public string? LegalName { get; set; }
 
     /// <summary>
     /// The company's tax number.
     /// </summary>
     [JsonPropertyName("tax_number")]
-    public string? TaxNumber { get; init; }
+    public string? TaxNumber { get; set; }
 
     /// <summary>
     /// The company's fiscal year end month.
     /// </summary>
     [JsonPropertyName("fiscal_year_end_month")]
-    public int? FiscalYearEndMonth { get; init; }
+    public int? FiscalYearEndMonth { get; set; }
 
     /// <summary>
     /// The company's fiscal year end day.
     /// </summary>
     [JsonPropertyName("fiscal_year_end_day")]
-    public int? FiscalYearEndDay { get; init; }
+    public int? FiscalYearEndDay { get; set; }
 
     /// <summary>
     /// The currency set in the company's accounting platform.
@@ -369,35 +368,35 @@ public class CompanyInfo
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// When the third party's company was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// The company's urls.
     /// </summary>
     [JsonPropertyName("urls")]
-    public IEnumerable<string>? Urls { get; init; }
+    public IEnumerable<string>? Urls { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<Address>? Addresses { get; init; }
+    public IEnumerable<Address>? Addresses { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<AccountingPhoneNumber>? PhoneNumbers { get; init; }
+    public IEnumerable<AccountingPhoneNumber>? PhoneNumbers { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/Contact.cs b/src/Merge.Client/Accounting/Types/Contact.cs
index b6843934..db3d3901 100644
--- a/src/Merge.Client/Accounting/Types/Contact.cs
+++ b/src/Merge.Client/Accounting/Types/Contact.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,58 +6,58 @@
 
 namespace Merge.Client.Accounting;
 
-public class Contact
+public record Contact
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The contact's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Whether the contact is a supplier.
     /// </summary>
     [JsonPropertyName("is_supplier")]
-    public bool? IsSupplier { get; init; }
+    public bool? IsSupplier { get; set; }
 
     /// <summary>
     /// Whether the contact is a customer.
     /// </summary>
     [JsonPropertyName("is_customer")]
-    public bool? IsCustomer { get; init; }
+    public bool? IsCustomer { get; set; }
 
     /// <summary>
     /// The contact's email address.
     /// </summary>
     [JsonPropertyName("email_address")]
-    public string? EmailAddress { get; init; }
+    public string? EmailAddress { get; set; }
 
     /// <summary>
     /// The contact's tax number.
     /// </summary>
     [JsonPropertyName("tax_number")]
-    public string? TaxNumber { get; init; }
+    public string? TaxNumber { get; set; }
 
     /// <summary>
     /// The contact's status
@@ -67,25 +66,25 @@ public class Contact
     /// - `ARCHIVED` - ARCHIVED
     /// </summary>
     [JsonPropertyName("status")]
-    public Status7D1Enum? Status { get; init; }
+    public Status7D1Enum? Status { get; set; }
 
     /// <summary>
     /// The currency the contact's transactions are in.
     /// </summary>
     [JsonPropertyName("currency")]
-    public string? Currency { get; init; }
+    public string? Currency { get; set; }
 
     /// <summary>
     /// When the third party's contact was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// The company the contact belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// `Address` object IDs for the given `Contacts` object.
@@ -97,23 +96,23 @@ public class Contact
             OneOfSerializer<OneOf<string, Address>>
         >)
     )]
-    public IEnumerable<OneOf<string, Address>>? Addresses { get; init; }
+    public IEnumerable<OneOf<string, Address>>? Addresses { get; set; }
 
     /// <summary>
     /// `AccountingPhoneNumber` object for the given `Contacts` object.
     /// </summary>
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<AccountingPhoneNumber>? PhoneNumbers { get; init; }
+    public IEnumerable<AccountingPhoneNumber>? PhoneNumbers { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ContactRequest.cs b/src/Merge.Client/Accounting/Types/ContactRequest.cs
index c4eed9ee..8b9b1519 100644
--- a/src/Merge.Client/Accounting/Types/ContactRequest.cs
+++ b/src/Merge.Client/Accounting/Types/ContactRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,37 +6,37 @@
 
 namespace Merge.Client.Accounting;
 
-public class ContactRequest
+public record ContactRequest
 {
     /// <summary>
     /// The contact's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Whether the contact is a supplier.
     /// </summary>
     [JsonPropertyName("is_supplier")]
-    public bool? IsSupplier { get; init; }
+    public bool? IsSupplier { get; set; }
 
     /// <summary>
     /// Whether the contact is a customer.
     /// </summary>
     [JsonPropertyName("is_customer")]
-    public bool? IsCustomer { get; init; }
+    public bool? IsCustomer { get; set; }
 
     /// <summary>
     /// The contact's email address.
     /// </summary>
     [JsonPropertyName("email_address")]
-    public string? EmailAddress { get; init; }
+    public string? EmailAddress { get; set; }
 
     /// <summary>
     /// The contact's tax number.
     /// </summary>
     [JsonPropertyName("tax_number")]
-    public string? TaxNumber { get; init; }
+    public string? TaxNumber { get; set; }
 
     /// <summary>
     /// The contact's status
@@ -46,19 +45,19 @@ public class ContactRequest
     /// - `ARCHIVED` - ARCHIVED
     /// </summary>
     [JsonPropertyName("status")]
-    public Status7D1Enum? Status { get; init; }
+    public Status7D1Enum? Status { get; set; }
 
     /// <summary>
     /// The currency the contact's transactions are in.
     /// </summary>
     [JsonPropertyName("currency")]
-    public string? Currency { get; init; }
+    public string? Currency { get; set; }
 
     /// <summary>
     /// The company the contact belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// `Address` object IDs for the given `Contacts` object.
@@ -70,17 +69,17 @@ public class ContactRequest
             OneOfSerializer<OneOf<string, Address>>
         >)
     )]
-    public IEnumerable<OneOf<string, Address>>? Addresses { get; init; }
+    public IEnumerable<OneOf<string, Address>>? Addresses { get; set; }
 
     /// <summary>
     /// `AccountingPhoneNumber` object for the given `Contacts` object.
     /// </summary>
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<AccountingPhoneNumberRequest>? PhoneNumbers { get; init; }
+    public IEnumerable<AccountingPhoneNumberRequest>? PhoneNumbers { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ContactResponse.cs b/src/Merge.Client/Accounting/Types/ContactResponse.cs
index a2c558f2..f0fb91d7 100644
--- a/src/Merge.Client/Accounting/Types/ContactResponse.cs
+++ b/src/Merge.Client/Accounting/Types/ContactResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class ContactResponse
+public record ContactResponse
 {
     [JsonPropertyName("model")]
-    public Contact Model { get; init; }
+    public required Contact Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/CountryEnum.cs b/src/Merge.Client/Accounting/Types/CountryEnum.cs
index bc2d8c39..d92204bc 100644
--- a/src/Merge.Client/Accounting/Types/CountryEnum.cs
+++ b/src/Merge.Client/Accounting/Types/CountryEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/CreditNote.cs b/src/Merge.Client/Accounting/Types/CreditNote.cs
index 693331b1..92666709 100644
--- a/src/Merge.Client/Accounting/Types/CreditNote.cs
+++ b/src/Merge.Client/Accounting/Types/CreditNote.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,34 +6,34 @@
 
 namespace Merge.Client.Accounting;
 
-public class CreditNote
+public record CreditNote
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The credit note's transaction date.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// The credit note's status.
@@ -44,48 +43,48 @@ public class CreditNote
     /// - `PAID` - PAID
     /// </summary>
     [JsonPropertyName("status")]
-    public CreditNoteStatusEnum? Status { get; init; }
+    public CreditNoteStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The credit note's number.
     /// </summary>
     [JsonPropertyName("number")]
-    public string? Number { get; init; }
+    public string? Number { get; set; }
 
     /// <summary>
     /// The credit note's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The company the credit note belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The credit note's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The credit note's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The amount of value remaining in the credit note that the customer can use.
     /// </summary>
     [JsonPropertyName("remaining_credit")]
-    public double? RemainingCredit { get; init; }
+    public double? RemainingCredit { get; set; }
 
     [JsonPropertyName("line_items")]
-    public IEnumerable<CreditNoteLineItem>? LineItems { get; init; }
+    public IEnumerable<CreditNoteLineItem>? LineItems { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -94,7 +93,7 @@ public class CreditNote
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The credit note's currency.
@@ -407,19 +406,19 @@ public class CreditNote
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// When the third party's credit note was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's credit note was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Array of `Payment` object IDs
@@ -431,7 +430,7 @@ public class CreditNote
             OneOfSerializer<OneOf<string, Payment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Payment>>? Payments { get; init; }
+    public IEnumerable<OneOf<string, Payment>>? Payments { get; set; }
 
     /// <summary>
     /// A list of the Payment Applied to Lines common models related to a given Invoice, Credit Note, or Journal Entry.
@@ -443,24 +442,24 @@ public class CreditNote
             OneOfSerializer<OneOf<string, PaymentLineItem>>
         >)
     )]
-    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedPayments { get; init; }
+    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedPayments { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The accounting period that the CreditNote was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/CreditNoteLineItem.cs b/src/Merge.Client/Accounting/Types/CreditNoteLineItem.cs
index 5c9e0c20..978175f6 100644
--- a/src/Merge.Client/Accounting/Types/CreditNoteLineItem.cs
+++ b/src/Merge.Client/Accounting/Types/CreditNoteLineItem.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,97 +6,97 @@
 
 namespace Merge.Client.Accounting;
 
-public class CreditNoteLineItem
+public record CreditNoteLineItem
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("item")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Item>>))]
-    public OneOf<string, Item>? Item { get; init; }
+    public OneOf<string, Item>? Item { get; set; }
 
     /// <summary>
     /// The credit note line item's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The description of the item that is owed.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The credit note line item's quantity.
     /// </summary>
     [JsonPropertyName("quantity")]
-    public string? Quantity { get; init; }
+    public string? Quantity { get; set; }
 
     /// <summary>
     /// The credit note line item's memo.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     /// <summary>
     /// The credit note line item's unit price.
     /// </summary>
     [JsonPropertyName("unit_price")]
-    public string? UnitPrice { get; init; }
+    public string? UnitPrice { get; set; }
 
     /// <summary>
     /// The credit note line item's total.
     /// </summary>
     [JsonPropertyName("total_line_amount")]
-    public string? TotalLineAmount { get; init; }
+    public string? TotalLineAmount { get; set; }
 
     /// <summary>
     /// The credit note line item's associated tracking category.
     /// </summary>
     [JsonPropertyName("tracking_category")]
-    public string? TrackingCategory { get; init; }
+    public string? TrackingCategory { get; set; }
 
     /// <summary>
     /// The credit note line item's associated tracking categories.
     /// </summary>
     [JsonPropertyName("tracking_categories")]
-    public IEnumerable<string> TrackingCategories { get; init; }
+    public IEnumerable<string> TrackingCategories { get; set; } = new List<string>();
 
     /// <summary>
     /// The credit note line item's account.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// The company the credit note belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/CreditNoteStatusEnum.cs b/src/Merge.Client/Accounting/Types/CreditNoteStatusEnum.cs
index 27f8a995..f32f2b05 100644
--- a/src/Merge.Client/Accounting/Types/CreditNoteStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/CreditNoteStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/CurrencyEnum.cs b/src/Merge.Client/Accounting/Types/CurrencyEnum.cs
index f27941cf..57d465e3 100644
--- a/src/Merge.Client/Accounting/Types/CurrencyEnum.cs
+++ b/src/Merge.Client/Accounting/Types/CurrencyEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/DataPassthroughRequest.cs b/src/Merge.Client/Accounting/Types/DataPassthroughRequest.cs
index 9bab55a7..5615cae1 100644
--- a/src/Merge.Client/Accounting/Types/DataPassthroughRequest.cs
+++ b/src/Merge.Client/Accounting/Types/DataPassthroughRequest.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class DataPassthroughRequest
+public record DataPassthroughRequest
 {
     [JsonPropertyName("method")]
-    public MethodEnum Method { get; init; }
+    public required MethodEnum Method { get; set; }
 
     /// <summary>
     /// The path of the request in the third party's platform.
     /// </summary>
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     /// <summary>
     /// An optional override of the third party's base url for the request.
     /// </summary>
     [JsonPropertyName("base_url_override")]
-    public string? BaseUrlOverride { get; init; }
+    public string? BaseUrlOverride { get; set; }
 
     /// <summary>
     /// The data with the request. You must include a `request_format` parameter matching the data's format
     /// </summary>
     [JsonPropertyName("data")]
-    public string? Data { get; init; }
+    public string? Data { get; set; }
 
     /// <summary>
     /// Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`.
     /// </summary>
     [JsonPropertyName("multipart_form_data")]
-    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; init; }
+    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; set; }
 
     /// <summary>
     /// The headers to use for the request (Merge will handle the account's authorization headers). `Content-Type` header is required for passthrough. Choose content type corresponding to expected format of receiving server.
     /// </summary>
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 
     [JsonPropertyName("request_format")]
-    public RequestFormatEnum? RequestFormat { get; init; }
+    public RequestFormatEnum? RequestFormat { get; set; }
 
     /// <summary>
     /// Optional. If true, the response will always be an object of the form `{"type": T, "value": ...}` where `T` will be one of `string, boolean, number, null, array, object`.
     /// </summary>
     [JsonPropertyName("normalize_response")]
-    public bool? NormalizeResponse { get; init; }
+    public bool? NormalizeResponse { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/DebugModeLog.cs b/src/Merge.Client/Accounting/Types/DebugModeLog.cs
index d3092a3a..5db304e7 100644
--- a/src/Merge.Client/Accounting/Types/DebugModeLog.cs
+++ b/src/Merge.Client/Accounting/Types/DebugModeLog.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class DebugModeLog
+public record DebugModeLog
 {
     [JsonPropertyName("log_id")]
-    public string LogId { get; init; }
+    public required string LogId { get; set; }
 
     [JsonPropertyName("dashboard_view")]
-    public string DashboardView { get; init; }
+    public required string DashboardView { get; set; }
 
     [JsonPropertyName("log_summary")]
-    public DebugModelLogSummary LogSummary { get; init; }
+    public required DebugModelLogSummary LogSummary { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/DebugModelLogSummary.cs b/src/Merge.Client/Accounting/Types/DebugModelLogSummary.cs
index 1eb96020..0cf0beb1 100644
--- a/src/Merge.Client/Accounting/Types/DebugModelLogSummary.cs
+++ b/src/Merge.Client/Accounting/Types/DebugModelLogSummary.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Accounting;
 
-public class DebugModelLogSummary
+public record DebugModelLogSummary
 {
     [JsonPropertyName("url")]
-    public string Url { get; init; }
+    public required string Url { get; set; }
 
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("status_code")]
-    public int StatusCode { get; init; }
+    public required int StatusCode { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/EnabledActionsEnum.cs b/src/Merge.Client/Accounting/Types/EnabledActionsEnum.cs
index 86e76061..3a34d461 100644
--- a/src/Merge.Client/Accounting/Types/EnabledActionsEnum.cs
+++ b/src/Merge.Client/Accounting/Types/EnabledActionsEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/EncodingEnum.cs b/src/Merge.Client/Accounting/Types/EncodingEnum.cs
index 3acf7a11..7ad67c79 100644
--- a/src/Merge.Client/Accounting/Types/EncodingEnum.cs
+++ b/src/Merge.Client/Accounting/Types/EncodingEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/ErrorValidationProblem.cs b/src/Merge.Client/Accounting/Types/ErrorValidationProblem.cs
index b879f714..08c69ba8 100644
--- a/src/Merge.Client/Accounting/Types/ErrorValidationProblem.cs
+++ b/src/Merge.Client/Accounting/Types/ErrorValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class ErrorValidationProblem
+public record ErrorValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/EventTypeEnum.cs b/src/Merge.Client/Accounting/Types/EventTypeEnum.cs
index d4082ee9..44fab163 100644
--- a/src/Merge.Client/Accounting/Types/EventTypeEnum.cs
+++ b/src/Merge.Client/Accounting/Types/EventTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/Expense.cs b/src/Merge.Client/Accounting/Types/Expense.cs
index 2e9632bc..9f4c9a32 100644
--- a/src/Merge.Client/Accounting/Types/Expense.cs
+++ b/src/Merge.Client/Accounting/Types/Expense.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,72 +6,72 @@
 
 namespace Merge.Client.Accounting;
 
-public class Expense
+public record Expense
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// When the transaction occurred.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// When the expense was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// The expense's payment account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The expense's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The expense's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The expense's total amount before tax.
     /// </summary>
     [JsonPropertyName("sub_total")]
-    public double? SubTotal { get; init; }
+    public double? SubTotal { get; set; }
 
     /// <summary>
     /// The expense's total tax amount.
     /// </summary>
     [JsonPropertyName("total_tax_amount")]
-    public double? TotalTaxAmount { get; init; }
+    public double? TotalTaxAmount { get; set; }
 
     /// <summary>
     /// The expense's currency.
@@ -385,29 +384,29 @@ public class Expense
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The expense's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the expense belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The expense's private note.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     [JsonPropertyName("lines")]
-    public IEnumerable<ExpenseLine>? Lines { get; init; }
+    public IEnumerable<ExpenseLine>? Lines { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -416,24 +415,24 @@ public class Expense
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The accounting period that the Expense was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ExpenseLine.cs b/src/Merge.Client/Accounting/Types/ExpenseLine.cs
index a1e93a71..e1705e75 100644
--- a/src/Merge.Client/Accounting/Types/ExpenseLine.cs
+++ b/src/Merge.Client/Accounting/Types/ExpenseLine.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,45 +6,45 @@
 
 namespace Merge.Client.Accounting;
 
-public class ExpenseLine
+public record ExpenseLine
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The line's item.
     /// </summary>
     [JsonPropertyName("item")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Item>>))]
-    public OneOf<string, Item>? Item { get; init; }
+    public OneOf<string, Item>? Item { get; set; }
 
     /// <summary>
     /// The line's net amount.
     /// </summary>
     [JsonPropertyName("net_amount")]
-    public double? NetAmount { get; init; }
+    public double? NetAmount { get; set; }
 
     [JsonPropertyName("tracking_category")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, TrackingCategory>>))]
-    public OneOf<string, TrackingCategory>? TrackingCategory { get; init; }
+    public OneOf<string, TrackingCategory>? TrackingCategory { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -54,13 +53,13 @@ public class ExpenseLine
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The company the line belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// The expense line item's currency.
@@ -373,37 +372,37 @@ public class ExpenseLine
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The expense's payment account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The expense's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The description of the item that was purchased by the company.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The expense line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ExpenseLineRequest.cs b/src/Merge.Client/Accounting/Types/ExpenseLineRequest.cs
index 00c6fb13..f673b554 100644
--- a/src/Merge.Client/Accounting/Types/ExpenseLineRequest.cs
+++ b/src/Merge.Client/Accounting/Types/ExpenseLineRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,30 +6,30 @@
 
 namespace Merge.Client.Accounting;
 
-public class ExpenseLineRequest
+public record ExpenseLineRequest
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The line's item.
     /// </summary>
     [JsonPropertyName("item")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Item>>))]
-    public OneOf<string, Item>? Item { get; init; }
+    public OneOf<string, Item>? Item { get; set; }
 
     /// <summary>
     /// The line's net amount.
     /// </summary>
     [JsonPropertyName("net_amount")]
-    public double? NetAmount { get; init; }
+    public double? NetAmount { get; set; }
 
     [JsonPropertyName("tracking_category")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, TrackingCategory>>))]
-    public OneOf<string, TrackingCategory>? TrackingCategory { get; init; }
+    public OneOf<string, TrackingCategory>? TrackingCategory { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -39,13 +38,13 @@ public class ExpenseLineRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The company the line belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// The expense line item's currency.
@@ -358,37 +357,37 @@ public class ExpenseLineRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The expense's payment account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The expense's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The description of the item that was purchased by the company.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The expense line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ExpenseRequest.cs b/src/Merge.Client/Accounting/Types/ExpenseRequest.cs
index f7564bac..fd90430e 100644
--- a/src/Merge.Client/Accounting/Types/ExpenseRequest.cs
+++ b/src/Merge.Client/Accounting/Types/ExpenseRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,45 +6,45 @@
 
 namespace Merge.Client.Accounting;
 
-public class ExpenseRequest
+public record ExpenseRequest
 {
     /// <summary>
     /// When the transaction occurred.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// The expense's payment account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The expense's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The expense's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The expense's total amount before tax.
     /// </summary>
     [JsonPropertyName("sub_total")]
-    public double? SubTotal { get; init; }
+    public double? SubTotal { get; set; }
 
     /// <summary>
     /// The expense's total tax amount.
     /// </summary>
     [JsonPropertyName("total_tax_amount")]
-    public double? TotalTaxAmount { get; init; }
+    public double? TotalTaxAmount { get; set; }
 
     /// <summary>
     /// The expense's currency.
@@ -358,29 +357,29 @@ public class ExpenseRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The expense's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the expense belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The expense's private note.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     [JsonPropertyName("lines")]
-    public IEnumerable<ExpenseLineRequest>? Lines { get; init; }
+    public IEnumerable<ExpenseLineRequest>? Lines { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -389,18 +388,18 @@ public class ExpenseRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The accounting period that the Expense was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ExpenseResponse.cs b/src/Merge.Client/Accounting/Types/ExpenseResponse.cs
index a54d3eb6..9ee9c23e 100644
--- a/src/Merge.Client/Accounting/Types/ExpenseResponse.cs
+++ b/src/Merge.Client/Accounting/Types/ExpenseResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class ExpenseResponse
+public record ExpenseResponse
 {
     [JsonPropertyName("model")]
-    public Expense Model { get; init; }
+    public required Expense Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ExternalTargetFieldApi.cs b/src/Merge.Client/Accounting/Types/ExternalTargetFieldApi.cs
index e18365ed..76e6c20c 100644
--- a/src/Merge.Client/Accounting/Types/ExternalTargetFieldApi.cs
+++ b/src/Merge.Client/Accounting/Types/ExternalTargetFieldApi.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Accounting;
 
-public class ExternalTargetFieldApi
+public record ExternalTargetFieldApi
 {
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_mapped")]
-    public string? IsMapped { get; init; }
+    public string? IsMapped { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ExternalTargetFieldApiResponse.cs b/src/Merge.Client/Accounting/Types/ExternalTargetFieldApiResponse.cs
index 0cb90ad9..49352f9c 100644
--- a/src/Merge.Client/Accounting/Types/ExternalTargetFieldApiResponse.cs
+++ b/src/Merge.Client/Accounting/Types/ExternalTargetFieldApiResponse.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class ExternalTargetFieldApiResponse
+public record ExternalTargetFieldApiResponse
 {
     [JsonPropertyName("Account")]
-    public IEnumerable<ExternalTargetFieldApi>? Account { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Account { get; set; }
 
     [JsonPropertyName("AccountingAttachment")]
-    public IEnumerable<ExternalTargetFieldApi>? AccountingAttachment { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? AccountingAttachment { get; set; }
 
     [JsonPropertyName("BalanceSheet")]
-    public IEnumerable<ExternalTargetFieldApi>? BalanceSheet { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? BalanceSheet { get; set; }
 
     [JsonPropertyName("CashFlowStatement")]
-    public IEnumerable<ExternalTargetFieldApi>? CashFlowStatement { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? CashFlowStatement { get; set; }
 
     [JsonPropertyName("CompanyInfo")]
-    public IEnumerable<ExternalTargetFieldApi>? CompanyInfo { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? CompanyInfo { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<ExternalTargetFieldApi>? Contact { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Contact { get; set; }
 
     [JsonPropertyName("IncomeStatement")]
-    public IEnumerable<ExternalTargetFieldApi>? IncomeStatement { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? IncomeStatement { get; set; }
 
     [JsonPropertyName("CreditNote")]
-    public IEnumerable<ExternalTargetFieldApi>? CreditNote { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? CreditNote { get; set; }
 
     [JsonPropertyName("Item")]
-    public IEnumerable<ExternalTargetFieldApi>? Item { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Item { get; set; }
 
     [JsonPropertyName("PurchaseOrder")]
-    public IEnumerable<ExternalTargetFieldApi>? PurchaseOrder { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? PurchaseOrder { get; set; }
 
     [JsonPropertyName("TrackingCategory")]
-    public IEnumerable<ExternalTargetFieldApi>? TrackingCategory { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? TrackingCategory { get; set; }
 
     [JsonPropertyName("JournalEntry")]
-    public IEnumerable<ExternalTargetFieldApi>? JournalEntry { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? JournalEntry { get; set; }
 
     [JsonPropertyName("TaxRate")]
-    public IEnumerable<ExternalTargetFieldApi>? TaxRate { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? TaxRate { get; set; }
 
     [JsonPropertyName("Invoice")]
-    public IEnumerable<ExternalTargetFieldApi>? Invoice { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Invoice { get; set; }
 
     [JsonPropertyName("Payment")]
-    public IEnumerable<ExternalTargetFieldApi>? Payment { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Payment { get; set; }
 
     [JsonPropertyName("Expense")]
-    public IEnumerable<ExternalTargetFieldApi>? Expense { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Expense { get; set; }
 
     [JsonPropertyName("VendorCredit")]
-    public IEnumerable<ExternalTargetFieldApi>? VendorCredit { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? VendorCredit { get; set; }
 
     [JsonPropertyName("Transaction")]
-    public IEnumerable<ExternalTargetFieldApi>? Transaction { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Transaction { get; set; }
 
     [JsonPropertyName("GeneralLedgerTransaction")]
-    public IEnumerable<ExternalTargetFieldApi>? GeneralLedgerTransaction { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? GeneralLedgerTransaction { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/FieldMappingApiInstance.cs b/src/Merge.Client/Accounting/Types/FieldMappingApiInstance.cs
index 0d2e5f08..5dbcc04e 100644
--- a/src/Merge.Client/Accounting/Types/FieldMappingApiInstance.cs
+++ b/src/Merge.Client/Accounting/Types/FieldMappingApiInstance.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class FieldMappingApiInstance
+public record FieldMappingApiInstance
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("is_integration_wide")]
-    public bool? IsIntegrationWide { get; init; }
+    public bool? IsIntegrationWide { get; set; }
 
     [JsonPropertyName("target_field")]
-    public FieldMappingApiInstanceTargetField? TargetField { get; init; }
+    public FieldMappingApiInstanceTargetField? TargetField { get; set; }
 
     [JsonPropertyName("remote_field")]
-    public FieldMappingApiInstanceRemoteField? RemoteField { get; init; }
+    public FieldMappingApiInstanceRemoteField? RemoteField { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceRemoteField.cs b/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceRemoteField.cs
index e2043f75..536898e4 100644
--- a/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceRemoteField.cs
+++ b/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceRemoteField.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class FieldMappingApiInstanceRemoteField
+public record FieldMappingApiInstanceRemoteField
 {
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_endpoint_info")]
-    public FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs b/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
index 4c75252a..5557ccb0 100644
--- a/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
+++ b/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Accounting;
 
-public class FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
+public record FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string? Method { get; init; }
+    public string? Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string? UrlPath { get; init; }
+    public string? UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<string>? FieldTraversalPath { get; init; }
+    public IEnumerable<string>? FieldTraversalPath { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceResponse.cs b/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceResponse.cs
index 6f59774e..e0c0dc54 100644
--- a/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceResponse.cs
+++ b/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceResponse.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class FieldMappingApiInstanceResponse
+public record FieldMappingApiInstanceResponse
 {
     [JsonPropertyName("Account")]
-    public IEnumerable<FieldMappingApiInstance>? Account { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Account { get; set; }
 
     [JsonPropertyName("AccountingAttachment")]
-    public IEnumerable<FieldMappingApiInstance>? AccountingAttachment { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? AccountingAttachment { get; set; }
 
     [JsonPropertyName("BalanceSheet")]
-    public IEnumerable<FieldMappingApiInstance>? BalanceSheet { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? BalanceSheet { get; set; }
 
     [JsonPropertyName("CashFlowStatement")]
-    public IEnumerable<FieldMappingApiInstance>? CashFlowStatement { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? CashFlowStatement { get; set; }
 
     [JsonPropertyName("CompanyInfo")]
-    public IEnumerable<FieldMappingApiInstance>? CompanyInfo { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? CompanyInfo { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<FieldMappingApiInstance>? Contact { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Contact { get; set; }
 
     [JsonPropertyName("IncomeStatement")]
-    public IEnumerable<FieldMappingApiInstance>? IncomeStatement { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? IncomeStatement { get; set; }
 
     [JsonPropertyName("CreditNote")]
-    public IEnumerable<FieldMappingApiInstance>? CreditNote { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? CreditNote { get; set; }
 
     [JsonPropertyName("Item")]
-    public IEnumerable<FieldMappingApiInstance>? Item { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Item { get; set; }
 
     [JsonPropertyName("PurchaseOrder")]
-    public IEnumerable<FieldMappingApiInstance>? PurchaseOrder { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? PurchaseOrder { get; set; }
 
     [JsonPropertyName("TrackingCategory")]
-    public IEnumerable<FieldMappingApiInstance>? TrackingCategory { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? TrackingCategory { get; set; }
 
     [JsonPropertyName("JournalEntry")]
-    public IEnumerable<FieldMappingApiInstance>? JournalEntry { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? JournalEntry { get; set; }
 
     [JsonPropertyName("TaxRate")]
-    public IEnumerable<FieldMappingApiInstance>? TaxRate { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? TaxRate { get; set; }
 
     [JsonPropertyName("Invoice")]
-    public IEnumerable<FieldMappingApiInstance>? Invoice { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Invoice { get; set; }
 
     [JsonPropertyName("Payment")]
-    public IEnumerable<FieldMappingApiInstance>? Payment { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Payment { get; set; }
 
     [JsonPropertyName("Expense")]
-    public IEnumerable<FieldMappingApiInstance>? Expense { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Expense { get; set; }
 
     [JsonPropertyName("VendorCredit")]
-    public IEnumerable<FieldMappingApiInstance>? VendorCredit { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? VendorCredit { get; set; }
 
     [JsonPropertyName("Transaction")]
-    public IEnumerable<FieldMappingApiInstance>? Transaction { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Transaction { get; set; }
 
     [JsonPropertyName("GeneralLedgerTransaction")]
-    public IEnumerable<FieldMappingApiInstance>? GeneralLedgerTransaction { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? GeneralLedgerTransaction { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceTargetField.cs b/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceTargetField.cs
index ac317e9d..e3532a71 100644
--- a/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceTargetField.cs
+++ b/src/Merge.Client/Accounting/Types/FieldMappingApiInstanceTargetField.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Accounting;
 
-public class FieldMappingApiInstanceTargetField
+public record FieldMappingApiInstanceTargetField
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string Description { get; init; }
+    public required string Description { get; set; }
 
     [JsonPropertyName("is_organization_wide")]
-    public bool IsOrganizationWide { get; init; }
+    public required bool IsOrganizationWide { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/FieldMappingInstanceResponse.cs b/src/Merge.Client/Accounting/Types/FieldMappingInstanceResponse.cs
index 11545016..8cd27045 100644
--- a/src/Merge.Client/Accounting/Types/FieldMappingInstanceResponse.cs
+++ b/src/Merge.Client/Accounting/Types/FieldMappingInstanceResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class FieldMappingInstanceResponse
+public record FieldMappingInstanceResponse
 {
     [JsonPropertyName("model")]
-    public FieldMappingApiInstance Model { get; init; }
+    public required FieldMappingApiInstance Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/FieldPermissionDeserializer.cs b/src/Merge.Client/Accounting/Types/FieldPermissionDeserializer.cs
index 14c7389a..490e5ac7 100644
--- a/src/Merge.Client/Accounting/Types/FieldPermissionDeserializer.cs
+++ b/src/Merge.Client/Accounting/Types/FieldPermissionDeserializer.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Accounting;
 
-public class FieldPermissionDeserializer
+public record FieldPermissionDeserializer
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/FieldPermissionDeserializerRequest.cs b/src/Merge.Client/Accounting/Types/FieldPermissionDeserializerRequest.cs
index 32a147dc..0b4f8b1a 100644
--- a/src/Merge.Client/Accounting/Types/FieldPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Accounting/Types/FieldPermissionDeserializerRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Accounting;
 
-public class FieldPermissionDeserializerRequest
+public record FieldPermissionDeserializerRequest
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/IncomeStatement.cs b/src/Merge.Client/Accounting/Types/IncomeStatement.cs
index 1f06e707..f5eda803 100644
--- a/src/Merge.Client/Accounting/Types/IncomeStatement.cs
+++ b/src/Merge.Client/Accounting/Types/IncomeStatement.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,34 +6,34 @@
 
 namespace Merge.Client.Accounting;
 
-public class IncomeStatement
+public record IncomeStatement
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The income statement's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The income statement's currency.
@@ -347,66 +346,66 @@ public class IncomeStatement
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The company the income statement belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The income statement's start period.
     /// </summary>
     [JsonPropertyName("start_period")]
-    public DateTime? StartPeriod { get; init; }
+    public DateTime? StartPeriod { get; set; }
 
     /// <summary>
     /// The income statement's end period.
     /// </summary>
     [JsonPropertyName("end_period")]
-    public DateTime? EndPeriod { get; init; }
+    public DateTime? EndPeriod { get; set; }
 
     [JsonPropertyName("income")]
-    public IEnumerable<ReportItem>? Income { get; init; }
+    public IEnumerable<ReportItem>? Income { get; set; }
 
     [JsonPropertyName("cost_of_sales")]
-    public IEnumerable<ReportItem>? CostOfSales { get; init; }
+    public IEnumerable<ReportItem>? CostOfSales { get; set; }
 
     /// <summary>
     /// The revenue minus the cost of sale.
     /// </summary>
     [JsonPropertyName("gross_profit")]
-    public double? GrossProfit { get; init; }
+    public double? GrossProfit { get; set; }
 
     [JsonPropertyName("operating_expenses")]
-    public IEnumerable<ReportItem>? OperatingExpenses { get; init; }
+    public IEnumerable<ReportItem>? OperatingExpenses { get; set; }
 
     /// <summary>
     /// The revenue minus the operating expenses.
     /// </summary>
     [JsonPropertyName("net_operating_income")]
-    public double? NetOperatingIncome { get; init; }
+    public double? NetOperatingIncome { get; set; }
 
     [JsonPropertyName("non_operating_expenses")]
-    public IEnumerable<ReportItem>? NonOperatingExpenses { get; init; }
+    public IEnumerable<ReportItem>? NonOperatingExpenses { get; set; }
 
     /// <summary>
     /// The gross profit minus the total expenses.
     /// </summary>
     [JsonPropertyName("net_income")]
-    public double? NetIncome { get; init; }
+    public double? NetIncome { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/IndividualCommonModelScopeDeserializer.cs b/src/Merge.Client/Accounting/Types/IndividualCommonModelScopeDeserializer.cs
index 8e0b45b5..9a6d72a6 100644
--- a/src/Merge.Client/Accounting/Types/IndividualCommonModelScopeDeserializer.cs
+++ b/src/Merge.Client/Accounting/Types/IndividualCommonModelScopeDeserializer.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class IndividualCommonModelScopeDeserializer
+public record IndividualCommonModelScopeDeserializer
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializer? FieldPermissions { get; init; }
+    public FieldPermissionDeserializer? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/IndividualCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Accounting/Types/IndividualCommonModelScopeDeserializerRequest.cs
index 0969662c..32f02078 100644
--- a/src/Merge.Client/Accounting/Types/IndividualCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Accounting/Types/IndividualCommonModelScopeDeserializerRequest.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class IndividualCommonModelScopeDeserializerRequest
+public record IndividualCommonModelScopeDeserializerRequest
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializerRequest? FieldPermissions { get; init; }
+    public FieldPermissionDeserializerRequest? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/Invoice.cs b/src/Merge.Client/Accounting/Types/Invoice.cs
index 32d2fec8..f1d2ba58 100644
--- a/src/Merge.Client/Accounting/Types/Invoice.cs
+++ b/src/Merge.Client/Accounting/Types/Invoice.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,28 +6,28 @@
 
 namespace Merge.Client.Accounting;
 
-public class Invoice
+public record Invoice
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// Whether the invoice is an accounts receivable or accounts payable. If `type` is `ACCOUNTS_PAYABLE`, the invoice is a bill. If `type` is `ACCOUNTS_RECEIVABLE`, it is an invoice.
@@ -37,51 +36,51 @@ public class Invoice
     /// - `ACCOUNTS_PAYABLE` - ACCOUNTS_PAYABLE
     /// </summary>
     [JsonPropertyName("type")]
-    public InvoiceTypeEnum? Type { get; init; }
+    public InvoiceTypeEnum? Type { get; set; }
 
     /// <summary>
     /// The invoice's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The invoice's number.
     /// </summary>
     [JsonPropertyName("number")]
-    public string? Number { get; init; }
+    public string? Number { get; set; }
 
     /// <summary>
     /// The invoice's issue date.
     /// </summary>
     [JsonPropertyName("issue_date")]
-    public DateTime? IssueDate { get; init; }
+    public DateTime? IssueDate { get; set; }
 
     /// <summary>
     /// The invoice's due date.
     /// </summary>
     [JsonPropertyName("due_date")]
-    public DateTime? DueDate { get; init; }
+    public DateTime? DueDate { get; set; }
 
     /// <summary>
     /// The invoice's paid date.
     /// </summary>
     [JsonPropertyName("paid_on_date")]
-    public DateTime? PaidOnDate { get; init; }
+    public DateTime? PaidOnDate { get; set; }
 
     /// <summary>
     /// The invoice's private note.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     /// <summary>
     /// The company the invoice belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The invoice's currency.
@@ -394,25 +393,25 @@ public class Invoice
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The invoice's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The total discounts applied to the total cost.
     /// </summary>
     [JsonPropertyName("total_discount")]
-    public double? TotalDiscount { get; init; }
+    public double? TotalDiscount { get; set; }
 
     /// <summary>
     /// The total amount being paid before taxes.
     /// </summary>
     [JsonPropertyName("sub_total")]
-    public double? SubTotal { get; init; }
+    public double? SubTotal { get; set; }
 
     /// <summary>
     /// The status of the invoice.
@@ -425,31 +424,31 @@ public class Invoice
     /// - `VOID` - VOID
     /// </summary>
     [JsonPropertyName("status")]
-    public InvoiceStatusEnum? Status { get; init; }
+    public InvoiceStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The total amount being paid in taxes.
     /// </summary>
     [JsonPropertyName("total_tax_amount")]
-    public double? TotalTaxAmount { get; init; }
+    public double? TotalTaxAmount { get; set; }
 
     /// <summary>
     /// The invoice's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The invoice's remaining balance.
     /// </summary>
     [JsonPropertyName("balance")]
-    public double? Balance { get; init; }
+    public double? Balance { get; set; }
 
     /// <summary>
     /// When the third party's invoice entry was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -458,7 +457,7 @@ public class Invoice
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// Array of `Payment` object IDs.
@@ -470,7 +469,7 @@ public class Invoice
             OneOfSerializer<OneOf<string, Payment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Payment>>? Payments { get; init; }
+    public IEnumerable<OneOf<string, Payment>>? Payments { get; set; }
 
     /// <summary>
     /// A list of the Payment Applied to Lines common models related to a given Invoice, Credit Note, or Journal Entry.
@@ -482,20 +481,20 @@ public class Invoice
             OneOfSerializer<OneOf<string, PaymentLineItem>>
         >)
     )]
-    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedPayments { get; init; }
+    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedPayments { get; set; }
 
     [JsonPropertyName("line_items")]
-    public IEnumerable<InvoiceLineItem>? LineItems { get; init; }
+    public IEnumerable<InvoiceLineItem>? LineItems { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The accounting period that the Invoice was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     [JsonPropertyName("purchase_orders")]
     [JsonConverter(
@@ -504,11 +503,11 @@ public class Invoice
             OneOfSerializer<OneOf<string, PurchaseOrder>>
         >)
     )]
-    public IEnumerable<OneOf<string, PurchaseOrder>>? PurchaseOrders { get; init; }
+    public IEnumerable<OneOf<string, PurchaseOrder>>? PurchaseOrders { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/InvoiceLineItem.cs b/src/Merge.Client/Accounting/Types/InvoiceLineItem.cs
index 48083886..001e45b1 100644
--- a/src/Merge.Client/Accounting/Types/InvoiceLineItem.cs
+++ b/src/Merge.Client/Accounting/Types/InvoiceLineItem.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,52 +6,52 @@
 
 namespace Merge.Client.Accounting;
 
-public class InvoiceLineItem
+public record InvoiceLineItem
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The line item's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The line item's unit price.
     /// </summary>
     [JsonPropertyName("unit_price")]
-    public double? UnitPrice { get; init; }
+    public double? UnitPrice { get; set; }
 
     /// <summary>
     /// The line item's quantity.
     /// </summary>
     [JsonPropertyName("quantity")]
-    public double? Quantity { get; init; }
+    public double? Quantity { get; set; }
 
     /// <summary>
     /// The line item's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The line item's currency.
@@ -365,25 +364,25 @@ public class InvoiceLineItem
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     [JsonPropertyName("item")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Item>>))]
-    public OneOf<string, Item>? Item { get; init; }
+    public OneOf<string, Item>? Item { get; set; }
 
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     [JsonPropertyName("tracking_category")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, TrackingCategory>>))]
-    public OneOf<string, TrackingCategory>? TrackingCategory { get; init; }
+    public OneOf<string, TrackingCategory>? TrackingCategory { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -392,20 +391,20 @@ public class InvoiceLineItem
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The company the line item belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/InvoiceLineItemRequest.cs b/src/Merge.Client/Accounting/Types/InvoiceLineItemRequest.cs
index ff907549..82aa7a8f 100644
--- a/src/Merge.Client/Accounting/Types/InvoiceLineItemRequest.cs
+++ b/src/Merge.Client/Accounting/Types/InvoiceLineItemRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,37 +6,37 @@
 
 namespace Merge.Client.Accounting;
 
-public class InvoiceLineItemRequest
+public record InvoiceLineItemRequest
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The line item's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The line item's unit price.
     /// </summary>
     [JsonPropertyName("unit_price")]
-    public double? UnitPrice { get; init; }
+    public double? UnitPrice { get; set; }
 
     /// <summary>
     /// The line item's quantity.
     /// </summary>
     [JsonPropertyName("quantity")]
-    public double? Quantity { get; init; }
+    public double? Quantity { get; set; }
 
     /// <summary>
     /// The line item's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The line item's currency.
@@ -350,25 +349,25 @@ public class InvoiceLineItemRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     [JsonPropertyName("item")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Item>>))]
-    public OneOf<string, Item>? Item { get; init; }
+    public OneOf<string, Item>? Item { get; set; }
 
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     [JsonPropertyName("tracking_category")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, TrackingCategory>>))]
-    public OneOf<string, TrackingCategory>? TrackingCategory { get; init; }
+    public OneOf<string, TrackingCategory>? TrackingCategory { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -377,17 +376,17 @@ public class InvoiceLineItemRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The company the line item belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/InvoiceRequest.cs b/src/Merge.Client/Accounting/Types/InvoiceRequest.cs
index e5b4c9bf..69694ae0 100644
--- a/src/Merge.Client/Accounting/Types/InvoiceRequest.cs
+++ b/src/Merge.Client/Accounting/Types/InvoiceRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,7 +6,7 @@
 
 namespace Merge.Client.Accounting;
 
-public class InvoiceRequest
+public record InvoiceRequest
 {
     /// <summary>
     /// Whether the invoice is an accounts receivable or accounts payable. If `type` is `ACCOUNTS_PAYABLE`, the invoice is a bill. If `type` is `ACCOUNTS_RECEIVABLE`, it is an invoice.
@@ -16,44 +15,44 @@ public class InvoiceRequest
     /// - `ACCOUNTS_PAYABLE` - ACCOUNTS_PAYABLE
     /// </summary>
     [JsonPropertyName("type")]
-    public InvoiceTypeEnum? Type { get; init; }
+    public InvoiceTypeEnum? Type { get; set; }
 
     /// <summary>
     /// The invoice's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The invoice's number.
     /// </summary>
     [JsonPropertyName("number")]
-    public string? Number { get; init; }
+    public string? Number { get; set; }
 
     /// <summary>
     /// The invoice's issue date.
     /// </summary>
     [JsonPropertyName("issue_date")]
-    public DateTime? IssueDate { get; init; }
+    public DateTime? IssueDate { get; set; }
 
     /// <summary>
     /// The invoice's due date.
     /// </summary>
     [JsonPropertyName("due_date")]
-    public DateTime? DueDate { get; init; }
+    public DateTime? DueDate { get; set; }
 
     /// <summary>
     /// The invoice's paid date.
     /// </summary>
     [JsonPropertyName("paid_on_date")]
-    public DateTime? PaidOnDate { get; init; }
+    public DateTime? PaidOnDate { get; set; }
 
     /// <summary>
     /// The invoice's private note.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     /// <summary>
     /// The status of the invoice.
@@ -66,14 +65,14 @@ public class InvoiceRequest
     /// - `VOID` - VOID
     /// </summary>
     [JsonPropertyName("status")]
-    public InvoiceStatusEnum? Status { get; init; }
+    public InvoiceStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The company the invoice belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The invoice's currency.
@@ -386,43 +385,43 @@ public class InvoiceRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The invoice's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The total discounts applied to the total cost.
     /// </summary>
     [JsonPropertyName("total_discount")]
-    public double? TotalDiscount { get; init; }
+    public double? TotalDiscount { get; set; }
 
     /// <summary>
     /// The total amount being paid before taxes.
     /// </summary>
     [JsonPropertyName("sub_total")]
-    public double? SubTotal { get; init; }
+    public double? SubTotal { get; set; }
 
     /// <summary>
     /// The total amount being paid in taxes.
     /// </summary>
     [JsonPropertyName("total_tax_amount")]
-    public double? TotalTaxAmount { get; init; }
+    public double? TotalTaxAmount { get; set; }
 
     /// <summary>
     /// The invoice's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The invoice's remaining balance.
     /// </summary>
     [JsonPropertyName("balance")]
-    public double? Balance { get; init; }
+    public double? Balance { get; set; }
 
     /// <summary>
     /// Array of `Payment` object IDs.
@@ -434,7 +433,7 @@ public class InvoiceRequest
             OneOfSerializer<OneOf<string, Payment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Payment>>? Payments { get; init; }
+    public IEnumerable<OneOf<string, Payment>>? Payments { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -443,10 +442,10 @@ public class InvoiceRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     [JsonPropertyName("line_items")]
-    public IEnumerable<InvoiceLineItemRequest>? LineItems { get; init; }
+    public IEnumerable<InvoiceLineItemRequest>? LineItems { get; set; }
 
     [JsonPropertyName("purchase_orders")]
     [JsonConverter(
@@ -455,11 +454,11 @@ public class InvoiceRequest
             OneOfSerializer<OneOf<string, PurchaseOrder>>
         >)
     )]
-    public IEnumerable<OneOf<string, PurchaseOrder>>? PurchaseOrders { get; init; }
+    public IEnumerable<OneOf<string, PurchaseOrder>>? PurchaseOrders { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/InvoiceResponse.cs b/src/Merge.Client/Accounting/Types/InvoiceResponse.cs
index d8cd4758..9b7dd6ad 100644
--- a/src/Merge.Client/Accounting/Types/InvoiceResponse.cs
+++ b/src/Merge.Client/Accounting/Types/InvoiceResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class InvoiceResponse
+public record InvoiceResponse
 {
     [JsonPropertyName("model")]
-    public Invoice Model { get; init; }
+    public required Invoice Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/InvoiceStatusEnum.cs b/src/Merge.Client/Accounting/Types/InvoiceStatusEnum.cs
index 3342d80f..b5779971 100644
--- a/src/Merge.Client/Accounting/Types/InvoiceStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/InvoiceStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/InvoiceTypeEnum.cs b/src/Merge.Client/Accounting/Types/InvoiceTypeEnum.cs
index f7054c70..2a8e23d4 100644
--- a/src/Merge.Client/Accounting/Types/InvoiceTypeEnum.cs
+++ b/src/Merge.Client/Accounting/Types/InvoiceTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/Issue.cs b/src/Merge.Client/Accounting/Types/Issue.cs
index 6125fa3a..02c30fc5 100644
--- a/src/Merge.Client/Accounting/Types/Issue.cs
+++ b/src/Merge.Client/Accounting/Types/Issue.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class Issue
+public record Issue
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -17,23 +16,23 @@ public class Issue
     /// - `RESOLVED` - RESOLVED
     /// </summary>
     [JsonPropertyName("status")]
-    public IssueStatusEnum? Status { get; init; }
+    public IssueStatusEnum? Status { get; set; }
 
     [JsonPropertyName("error_description")]
-    public string ErrorDescription { get; init; }
+    public required string ErrorDescription { get; set; }
 
     [JsonPropertyName("end_user")]
-    public Dictionary<string, object>? EndUser { get; init; }
+    public Dictionary<string, object?>? EndUser { get; set; }
 
     [JsonPropertyName("first_incident_time")]
-    public DateTime? FirstIncidentTime { get; init; }
+    public DateTime? FirstIncidentTime { get; set; }
 
     [JsonPropertyName("last_incident_time")]
-    public DateTime? LastIncidentTime { get; init; }
+    public DateTime? LastIncidentTime { get; set; }
 
     [JsonPropertyName("is_muted")]
-    public bool? IsMuted { get; init; }
+    public bool? IsMuted { get; set; }
 
     [JsonPropertyName("error_details")]
-    public IEnumerable<string>? ErrorDetails { get; init; }
+    public IEnumerable<string>? ErrorDetails { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/IssueStatusEnum.cs b/src/Merge.Client/Accounting/Types/IssueStatusEnum.cs
index 84987212..6a67e83f 100644
--- a/src/Merge.Client/Accounting/Types/IssueStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/IssueStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/Item.cs b/src/Merge.Client/Accounting/Types/Item.cs
index cf68abbe..fcf8ac66 100644
--- a/src/Merge.Client/Accounting/Types/Item.cs
+++ b/src/Merge.Client/Accounting/Types/Item.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,34 +6,34 @@
 
 namespace Merge.Client.Accounting;
 
-public class Item
+public record Item
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The item's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The item's status.
@@ -43,56 +42,56 @@ public class Item
     /// - `ARCHIVED` - ARCHIVED
     /// </summary>
     [JsonPropertyName("status")]
-    public Status7D1Enum? Status { get; init; }
+    public Status7D1Enum? Status { get; set; }
 
     /// <summary>
     /// The item's unit price.
     /// </summary>
     [JsonPropertyName("unit_price")]
-    public double? UnitPrice { get; init; }
+    public double? UnitPrice { get; set; }
 
     /// <summary>
     /// The price at which the item is purchased from a vendor.
     /// </summary>
     [JsonPropertyName("purchase_price")]
-    public double? PurchasePrice { get; init; }
+    public double? PurchasePrice { get; set; }
 
     /// <summary>
     /// References the default account used to record a purchase of the item.
     /// </summary>
     [JsonPropertyName("purchase_account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? PurchaseAccount { get; init; }
+    public OneOf<string, Account>? PurchaseAccount { get; set; }
 
     /// <summary>
     /// References the default account used to record a sale.
     /// </summary>
     [JsonPropertyName("sales_account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? SalesAccount { get; init; }
+    public OneOf<string, Account>? SalesAccount { get; set; }
 
     /// <summary>
     /// The company the item belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// When the third party's item note was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/JournalEntry.cs b/src/Merge.Client/Accounting/Types/JournalEntry.cs
index 22528407..fd3e2f31 100644
--- a/src/Merge.Client/Accounting/Types/JournalEntry.cs
+++ b/src/Merge.Client/Accounting/Types/JournalEntry.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,46 +6,46 @@
 
 namespace Merge.Client.Accounting;
 
-public class JournalEntry
+public record JournalEntry
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The journal entry's transaction date.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// When the third party's journal entry was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's journal entry was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Array of `Payment` object IDs.
@@ -58,7 +57,7 @@ public class JournalEntry
             OneOfSerializer<OneOf<string, Payment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Payment>>? Payments { get; init; }
+    public IEnumerable<OneOf<string, Payment>>? Payments { get; set; }
 
     /// <summary>
     /// A list of the Payment Applied to Lines common models related to a given Invoice, Credit Note, or Journal Entry.
@@ -70,13 +69,13 @@ public class JournalEntry
             OneOfSerializer<OneOf<string, PaymentLineItem>>
         >)
     )]
-    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedPayments { get; init; }
+    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedPayments { get; set; }
 
     /// <summary>
     /// The journal entry's private note.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     /// <summary>
     /// The journal's currency.
@@ -389,29 +388,29 @@ public class JournalEntry
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The journal entry's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the journal entry belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     [JsonPropertyName("lines")]
-    public IEnumerable<JournalLine>? Lines { get; init; }
+    public IEnumerable<JournalLine>? Lines { get; set; }
 
     /// <summary>
     /// Reference number for identifying journal entries.
     /// </summary>
     [JsonPropertyName("journal_number")]
-    public string? JournalNumber { get; init; }
+    public string? JournalNumber { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -420,10 +419,10 @@ public class JournalEntry
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The journal's posting status.
@@ -432,18 +431,18 @@ public class JournalEntry
     /// - `POSTED` - POSTED
     /// </summary>
     [JsonPropertyName("posting_status")]
-    public PostingStatusEnum? PostingStatus { get; init; }
+    public PostingStatusEnum? PostingStatus { get; set; }
 
     /// <summary>
     /// The accounting period that the JournalEntry was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/JournalEntryRequest.cs b/src/Merge.Client/Accounting/Types/JournalEntryRequest.cs
index 64987beb..4a79e3ed 100644
--- a/src/Merge.Client/Accounting/Types/JournalEntryRequest.cs
+++ b/src/Merge.Client/Accounting/Types/JournalEntryRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,13 +6,13 @@
 
 namespace Merge.Client.Accounting;
 
-public class JournalEntryRequest
+public record JournalEntryRequest
 {
     /// <summary>
     /// The journal entry's transaction date.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// Array of `Payment` object IDs.
@@ -25,13 +24,13 @@ public class JournalEntryRequest
             OneOfSerializer<OneOf<string, Payment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Payment>>? Payments { get; init; }
+    public IEnumerable<OneOf<string, Payment>>? Payments { get; set; }
 
     /// <summary>
     /// The journal entry's private note.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     /// <summary>
     /// The journal's currency.
@@ -344,20 +343,20 @@ public class JournalEntryRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The journal entry's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the journal entry belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -366,16 +365,16 @@ public class JournalEntryRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     [JsonPropertyName("lines")]
-    public IEnumerable<JournalLineRequest>? Lines { get; init; }
+    public IEnumerable<JournalLineRequest>? Lines { get; set; }
 
     /// <summary>
     /// Reference number for identifying journal entries.
     /// </summary>
     [JsonPropertyName("journal_number")]
-    public string? JournalNumber { get; init; }
+    public string? JournalNumber { get; set; }
 
     /// <summary>
     /// The journal's posting status.
@@ -384,11 +383,11 @@ public class JournalEntryRequest
     /// - `POSTED` - POSTED
     /// </summary>
     [JsonPropertyName("posting_status")]
-    public PostingStatusEnum? PostingStatus { get; init; }
+    public PostingStatusEnum? PostingStatus { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/JournalEntryResponse.cs b/src/Merge.Client/Accounting/Types/JournalEntryResponse.cs
index 89065362..7b189c2c 100644
--- a/src/Merge.Client/Accounting/Types/JournalEntryResponse.cs
+++ b/src/Merge.Client/Accounting/Types/JournalEntryResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class JournalEntryResponse
+public record JournalEntryResponse
 {
     [JsonPropertyName("model")]
-    public JournalEntry Model { get; init; }
+    public required JournalEntry Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/JournalLine.cs b/src/Merge.Client/Accounting/Types/JournalLine.cs
index 5b1a00f7..782d8f01 100644
--- a/src/Merge.Client/Accounting/Types/JournalLine.cs
+++ b/src/Merge.Client/Accounting/Types/JournalLine.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,42 +6,42 @@
 
 namespace Merge.Client.Accounting;
 
-public class JournalLine
+public record JournalLine
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The value of the line item including taxes and other fees.
     /// </summary>
     [JsonPropertyName("net_amount")]
-    public double? NetAmount { get; init; }
+    public double? NetAmount { get; set; }
 
     [JsonPropertyName("tracking_category")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, TrackingCategory>>))]
-    public OneOf<string, TrackingCategory>? TrackingCategory { get; init; }
+    public OneOf<string, TrackingCategory>? TrackingCategory { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -51,7 +50,7 @@ public class JournalLine
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The journal line item's currency.
@@ -364,32 +363,32 @@ public class JournalLine
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The company the journal entry belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     [JsonPropertyName("contact")]
-    public string? Contact { get; init; }
+    public string? Contact { get; set; }
 
     /// <summary>
     /// The line's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The journal line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/JournalLineRequest.cs b/src/Merge.Client/Accounting/Types/JournalLineRequest.cs
index b7cd6cc7..f836fb6b 100644
--- a/src/Merge.Client/Accounting/Types/JournalLineRequest.cs
+++ b/src/Merge.Client/Accounting/Types/JournalLineRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,27 +6,27 @@
 
 namespace Merge.Client.Accounting;
 
-public class JournalLineRequest
+public record JournalLineRequest
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The value of the line item including taxes and other fees.
     /// </summary>
     [JsonPropertyName("net_amount")]
-    public double? NetAmount { get; init; }
+    public double? NetAmount { get; set; }
 
     [JsonPropertyName("tracking_category")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, TrackingCategory>>))]
-    public OneOf<string, TrackingCategory>? TrackingCategory { get; init; }
+    public OneOf<string, TrackingCategory>? TrackingCategory { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -36,7 +35,7 @@ public class JournalLineRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The journal line item's currency.
@@ -349,32 +348,32 @@ public class JournalLineRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The company the journal entry belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     [JsonPropertyName("contact")]
-    public string? Contact { get; init; }
+    public string? Contact { get; set; }
 
     /// <summary>
     /// The line's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The journal line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/LinkToken.cs b/src/Merge.Client/Accounting/Types/LinkToken.cs
index 5824094e..ba0a764f 100644
--- a/src/Merge.Client/Accounting/Types/LinkToken.cs
+++ b/src/Merge.Client/Accounting/Types/LinkToken.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Accounting;
 
-public class LinkToken
+public record LinkToken
 {
     [JsonPropertyName("link_token")]
-    public string LinkToken_ { get; init; }
+    public required string LinkToken_ { get; set; }
 
     [JsonPropertyName("integration_name")]
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     [JsonPropertyName("magic_link_url")]
-    public string? MagicLinkUrl { get; init; }
+    public string? MagicLinkUrl { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/LinkedAccountStatus.cs b/src/Merge.Client/Accounting/Types/LinkedAccountStatus.cs
index 26dd96c5..7ee868f9 100644
--- a/src/Merge.Client/Accounting/Types/LinkedAccountStatus.cs
+++ b/src/Merge.Client/Accounting/Types/LinkedAccountStatus.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Accounting;
 
-public class LinkedAccountStatus
+public record LinkedAccountStatus
 {
     [JsonPropertyName("linked_account_status")]
-    public string LinkedAccountStatus_ { get; init; }
+    public required string LinkedAccountStatus_ { get; set; }
 
     [JsonPropertyName("can_make_request")]
-    public bool CanMakeRequest { get; init; }
+    public required bool CanMakeRequest { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/MetaResponse.cs b/src/Merge.Client/Accounting/Types/MetaResponse.cs
index 72ecb0a3..1b69c3ef 100644
--- a/src/Merge.Client/Accounting/Types/MetaResponse.cs
+++ b/src/Merge.Client/Accounting/Types/MetaResponse.cs
@@ -1,24 +1,24 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class MetaResponse
+public record MetaResponse
 {
     [JsonPropertyName("request_schema")]
-    public Dictionary<string, object> RequestSchema { get; init; }
+    public Dictionary<string, object?> RequestSchema { get; set; } =
+        new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_field_classes")]
-    public Dictionary<string, object>? RemoteFieldClasses { get; init; }
+    public Dictionary<string, object?>? RemoteFieldClasses { get; set; }
 
     [JsonPropertyName("status")]
-    public LinkedAccountStatus? Status { get; init; }
+    public LinkedAccountStatus? Status { get; set; }
 
     [JsonPropertyName("has_conditional_params")]
-    public bool HasConditionalParams { get; init; }
+    public required bool HasConditionalParams { get; set; }
 
     [JsonPropertyName("has_required_linked_account_params")]
-    public bool HasRequiredLinkedAccountParams { get; init; }
+    public required bool HasRequiredLinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/MethodEnum.cs b/src/Merge.Client/Accounting/Types/MethodEnum.cs
index 39d2aa49..f00205a7 100644
--- a/src/Merge.Client/Accounting/Types/MethodEnum.cs
+++ b/src/Merge.Client/Accounting/Types/MethodEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/ModelOperation.cs b/src/Merge.Client/Accounting/Types/ModelOperation.cs
index 4e329411..585d6727 100644
--- a/src/Merge.Client/Accounting/Types/ModelOperation.cs
+++ b/src/Merge.Client/Accounting/Types/ModelOperation.cs
@@ -4,17 +4,17 @@
 
 namespace Merge.Client.Accounting;
 
-public class ModelOperation
+public record ModelOperation
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("available_operations")]
-    public IEnumerable<string> AvailableOperations { get; init; }
+    public IEnumerable<string> AvailableOperations { get; set; } = new List<string>();
 
     [JsonPropertyName("required_post_parameters")]
-    public IEnumerable<string> RequiredPostParameters { get; init; }
+    public IEnumerable<string> RequiredPostParameters { get; set; } = new List<string>();
 
     [JsonPropertyName("supported_fields")]
-    public IEnumerable<string> SupportedFields { get; init; }
+    public IEnumerable<string> SupportedFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Accounting/Types/ModelPermissionDeserializer.cs b/src/Merge.Client/Accounting/Types/ModelPermissionDeserializer.cs
index b8dcc5a6..dbdb3fae 100644
--- a/src/Merge.Client/Accounting/Types/ModelPermissionDeserializer.cs
+++ b/src/Merge.Client/Accounting/Types/ModelPermissionDeserializer.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Accounting;
 
-public class ModelPermissionDeserializer
+public record ModelPermissionDeserializer
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ModelPermissionDeserializerRequest.cs b/src/Merge.Client/Accounting/Types/ModelPermissionDeserializerRequest.cs
index aa6d1abe..4807a9b5 100644
--- a/src/Merge.Client/Accounting/Types/ModelPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Accounting/Types/ModelPermissionDeserializerRequest.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Accounting;
 
-public class ModelPermissionDeserializerRequest
+public record ModelPermissionDeserializerRequest
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/MultipartFormFieldRequest.cs b/src/Merge.Client/Accounting/Types/MultipartFormFieldRequest.cs
index 2328390a..7fe2cfe0 100644
--- a/src/Merge.Client/Accounting/Types/MultipartFormFieldRequest.cs
+++ b/src/Merge.Client/Accounting/Types/MultipartFormFieldRequest.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class MultipartFormFieldRequest
+public record MultipartFormFieldRequest
 {
     /// <summary>
     /// The name of the form field
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// The data for the form field.
     /// </summary>
     [JsonPropertyName("data")]
-    public string Data { get; init; }
+    public required string Data { get; set; }
 
     /// <summary>
     /// The encoding of the value of `data`. Defaults to `RAW` if not defined.
@@ -27,17 +26,17 @@ public class MultipartFormFieldRequest
     /// - `GZIP_BASE64` - GZIP_BASE64
     /// </summary>
     [JsonPropertyName("encoding")]
-    public EncodingEnum? Encoding { get; init; }
+    public EncodingEnum? Encoding { get; set; }
 
     /// <summary>
     /// The file name of the form field, if the field is for a file.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The MIME type of the file, if the field is for a file.
     /// </summary>
     [JsonPropertyName("content_type")]
-    public string? ContentType { get; init; }
+    public string? ContentType { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedAccountDetailsAndActionsList.cs b/src/Merge.Client/Accounting/Types/PaginatedAccountDetailsAndActionsList.cs
index d3cd2f16..2290039a 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedAccountDetailsAndActionsList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedAccountDetailsAndActionsList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedAccountDetailsAndActionsList
+public record PaginatedAccountDetailsAndActionsList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AccountDetailsAndActions>? Results { get; init; }
+    public IEnumerable<AccountDetailsAndActions>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedAccountList.cs b/src/Merge.Client/Accounting/Types/PaginatedAccountList.cs
index f21823ef..4831a059 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedAccountList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedAccountList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedAccountList
+public record PaginatedAccountList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Account>? Results { get; init; }
+    public IEnumerable<Account>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedAccountingAttachmentList.cs b/src/Merge.Client/Accounting/Types/PaginatedAccountingAttachmentList.cs
index f1dc096e..b4356c56 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedAccountingAttachmentList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedAccountingAttachmentList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedAccountingAttachmentList
+public record PaginatedAccountingAttachmentList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AccountingAttachment>? Results { get; init; }
+    public IEnumerable<AccountingAttachment>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedAccountingPeriodList.cs b/src/Merge.Client/Accounting/Types/PaginatedAccountingPeriodList.cs
index 7e05fba2..b450e6f6 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedAccountingPeriodList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedAccountingPeriodList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedAccountingPeriodList
+public record PaginatedAccountingPeriodList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AccountingPeriod>? Results { get; init; }
+    public IEnumerable<AccountingPeriod>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedAuditLogEventList.cs b/src/Merge.Client/Accounting/Types/PaginatedAuditLogEventList.cs
index 407208c1..59c92535 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedAuditLogEventList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedAuditLogEventList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedAuditLogEventList
+public record PaginatedAuditLogEventList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AuditLogEvent>? Results { get; init; }
+    public IEnumerable<AuditLogEvent>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedBalanceSheetList.cs b/src/Merge.Client/Accounting/Types/PaginatedBalanceSheetList.cs
index 8d935014..c6bd21d9 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedBalanceSheetList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedBalanceSheetList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedBalanceSheetList
+public record PaginatedBalanceSheetList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<BalanceSheet>? Results { get; init; }
+    public IEnumerable<BalanceSheet>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedCashFlowStatementList.cs b/src/Merge.Client/Accounting/Types/PaginatedCashFlowStatementList.cs
index 09b8f373..d24ec48e 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedCashFlowStatementList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedCashFlowStatementList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedCashFlowStatementList
+public record PaginatedCashFlowStatementList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<CashFlowStatement>? Results { get; init; }
+    public IEnumerable<CashFlowStatement>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedCompanyInfoList.cs b/src/Merge.Client/Accounting/Types/PaginatedCompanyInfoList.cs
index 5293aacd..0cdfe1a6 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedCompanyInfoList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedCompanyInfoList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedCompanyInfoList
+public record PaginatedCompanyInfoList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<CompanyInfo>? Results { get; init; }
+    public IEnumerable<CompanyInfo>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedContactList.cs b/src/Merge.Client/Accounting/Types/PaginatedContactList.cs
index 921b0190..69036735 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedContactList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedContactList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedContactList
+public record PaginatedContactList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Contact>? Results { get; init; }
+    public IEnumerable<Contact>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedCreditNoteList.cs b/src/Merge.Client/Accounting/Types/PaginatedCreditNoteList.cs
index 226ee48b..74b5630c 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedCreditNoteList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedCreditNoteList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedCreditNoteList
+public record PaginatedCreditNoteList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<CreditNote>? Results { get; init; }
+    public IEnumerable<CreditNote>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedExpenseList.cs b/src/Merge.Client/Accounting/Types/PaginatedExpenseList.cs
index 4a81787b..7eb15b46 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedExpenseList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedExpenseList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedExpenseList
+public record PaginatedExpenseList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Expense>? Results { get; init; }
+    public IEnumerable<Expense>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedIncomeStatementList.cs b/src/Merge.Client/Accounting/Types/PaginatedIncomeStatementList.cs
index 1ff506f7..45238f68 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedIncomeStatementList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedIncomeStatementList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedIncomeStatementList
+public record PaginatedIncomeStatementList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<IncomeStatement>? Results { get; init; }
+    public IEnumerable<IncomeStatement>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedInvoiceList.cs b/src/Merge.Client/Accounting/Types/PaginatedInvoiceList.cs
index ad68199f..7b339ad5 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedInvoiceList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedInvoiceList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedInvoiceList
+public record PaginatedInvoiceList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Invoice>? Results { get; init; }
+    public IEnumerable<Invoice>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedIssueList.cs b/src/Merge.Client/Accounting/Types/PaginatedIssueList.cs
index 2f274256..e71de8d5 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedIssueList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedIssueList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedIssueList
+public record PaginatedIssueList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Issue>? Results { get; init; }
+    public IEnumerable<Issue>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedItemList.cs b/src/Merge.Client/Accounting/Types/PaginatedItemList.cs
index 8c2f7e55..81a85d3d 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedItemList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedItemList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedItemList
+public record PaginatedItemList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Item>? Results { get; init; }
+    public IEnumerable<Item>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedJournalEntryList.cs b/src/Merge.Client/Accounting/Types/PaginatedJournalEntryList.cs
index 7b06c635..ab8aa0bb 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedJournalEntryList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedJournalEntryList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedJournalEntryList
+public record PaginatedJournalEntryList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<JournalEntry>? Results { get; init; }
+    public IEnumerable<JournalEntry>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedPaymentList.cs b/src/Merge.Client/Accounting/Types/PaginatedPaymentList.cs
index 8757f692..6f05c24d 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedPaymentList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedPaymentList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedPaymentList
+public record PaginatedPaymentList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Payment>? Results { get; init; }
+    public IEnumerable<Payment>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedPurchaseOrderList.cs b/src/Merge.Client/Accounting/Types/PaginatedPurchaseOrderList.cs
index 03cf2355..53e7c9cf 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedPurchaseOrderList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedPurchaseOrderList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedPurchaseOrderList
+public record PaginatedPurchaseOrderList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<PurchaseOrder>? Results { get; init; }
+    public IEnumerable<PurchaseOrder>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedSyncStatusList.cs b/src/Merge.Client/Accounting/Types/PaginatedSyncStatusList.cs
index 9d7f3e9e..138dc491 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedSyncStatusList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedSyncStatusList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedSyncStatusList
+public record PaginatedSyncStatusList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<SyncStatus>? Results { get; init; }
+    public IEnumerable<SyncStatus>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedTaxRateList.cs b/src/Merge.Client/Accounting/Types/PaginatedTaxRateList.cs
index e4a66b42..cec00483 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedTaxRateList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedTaxRateList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedTaxRateList
+public record PaginatedTaxRateList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<TaxRate>? Results { get; init; }
+    public IEnumerable<TaxRate>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedTrackingCategoryList.cs b/src/Merge.Client/Accounting/Types/PaginatedTrackingCategoryList.cs
index 1e18c58c..f208804e 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedTrackingCategoryList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedTrackingCategoryList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedTrackingCategoryList
+public record PaginatedTrackingCategoryList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<TrackingCategory>? Results { get; init; }
+    public IEnumerable<TrackingCategory>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedTransactionList.cs b/src/Merge.Client/Accounting/Types/PaginatedTransactionList.cs
index 3baa9353..0a4b4a76 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedTransactionList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedTransactionList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedTransactionList
+public record PaginatedTransactionList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Transaction>? Results { get; init; }
+    public IEnumerable<Transaction>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaginatedVendorCreditList.cs b/src/Merge.Client/Accounting/Types/PaginatedVendorCreditList.cs
index d60550ec..aa0fff94 100644
--- a/src/Merge.Client/Accounting/Types/PaginatedVendorCreditList.cs
+++ b/src/Merge.Client/Accounting/Types/PaginatedVendorCreditList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaginatedVendorCreditList
+public record PaginatedVendorCreditList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<VendorCredit>? Results { get; init; }
+    public IEnumerable<VendorCredit>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PatchedPaymentRequest.cs b/src/Merge.Client/Accounting/Types/PatchedPaymentRequest.cs
index 05ca6ed8..906b5263 100644
--- a/src/Merge.Client/Accounting/Types/PatchedPaymentRequest.cs
+++ b/src/Merge.Client/Accounting/Types/PatchedPaymentRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,27 +6,27 @@
 
 namespace Merge.Client.Accounting;
 
-public class PatchedPaymentRequest
+public record PatchedPaymentRequest
 {
     /// <summary>
     /// The payment's transaction date.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// The supplier, or customer involved in the payment.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The supplier’s or customer’s account in which the payment is made.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The payment's currency.
@@ -340,26 +339,26 @@ public class PatchedPaymentRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The payment's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the payment belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The total amount of money being paid to the supplier, or customer, after taxes.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The type of the invoice.
@@ -368,7 +367,7 @@ public class PatchedPaymentRequest
     /// - `ACCOUNTS_RECEIVABLE` - ACCOUNTS_RECEIVABLE
     /// </summary>
     [JsonPropertyName("type")]
-    public PaymentTypeEnum? Type { get; init; }
+    public PaymentTypeEnum? Type { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -377,14 +376,14 @@ public class PatchedPaymentRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The accounting period that the Payment was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     /// <summary>
     /// A list of “Payment Applied to Lines” objects.
@@ -396,11 +395,11 @@ public class PatchedPaymentRequest
             OneOfSerializer<OneOf<string, PaymentLineItem>>
         >)
     )]
-    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedToLines { get; init; }
+    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedToLines { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/Payment.cs b/src/Merge.Client/Accounting/Types/Payment.cs
index 5331e502..6338ee20 100644
--- a/src/Merge.Client/Accounting/Types/Payment.cs
+++ b/src/Merge.Client/Accounting/Types/Payment.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,48 +6,48 @@
 
 namespace Merge.Client.Accounting;
 
-public class Payment
+public record Payment
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The payment's transaction date.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// The supplier, or customer involved in the payment.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The supplier’s or customer’s account in which the payment is made.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The payment's currency.
@@ -361,26 +360,26 @@ public class Payment
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The payment's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the payment belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The total amount of money being paid to the supplier, or customer, after taxes.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The type of the invoice.
@@ -389,7 +388,7 @@ public class Payment
     /// - `ACCOUNTS_RECEIVABLE` - ACCOUNTS_RECEIVABLE
     /// </summary>
     [JsonPropertyName("type")]
-    public PaymentTypeEnum? Type { get; init; }
+    public PaymentTypeEnum? Type { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -398,26 +397,26 @@ public class Payment
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// When the third party's payment entry was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The accounting period that the Payment was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     /// <summary>
     /// A list of “Payment Applied to Lines” objects.
@@ -429,11 +428,11 @@ public class Payment
             OneOfSerializer<OneOf<string, PaymentLineItem>>
         >)
     )]
-    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedToLines { get; init; }
+    public IEnumerable<OneOf<string, PaymentLineItem>>? AppliedToLines { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaymentLineItem.cs b/src/Merge.Client/Accounting/Types/PaymentLineItem.cs
index 2890b7d1..4fe6aa23 100644
--- a/src/Merge.Client/Accounting/Types/PaymentLineItem.cs
+++ b/src/Merge.Client/Accounting/Types/PaymentLineItem.cs
@@ -4,50 +4,50 @@
 
 namespace Merge.Client.Accounting;
 
-public class PaymentLineItem
+public record PaymentLineItem
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The amount being applied to the transaction.
     /// </summary>
     [JsonPropertyName("applied_amount")]
-    public string? AppliedAmount { get; init; }
+    public string? AppliedAmount { get; set; }
 
     /// <summary>
     /// The date the payment portion is applied.
     /// </summary>
     [JsonPropertyName("applied_date")]
-    public DateTime? AppliedDate { get; init; }
+    public DateTime? AppliedDate { get; set; }
 
     /// <summary>
     /// The Merge ID of the transaction the payment portion is being applied to.
     /// </summary>
     [JsonPropertyName("related_object_id")]
-    public string? RelatedObjectId { get; init; }
+    public string? RelatedObjectId { get; set; }
 
     /// <summary>
     /// The type of transaction the payment portion is being applied to. Possible values include: INVOICE, JOURNAL_ENTRY, or CREDIT_NOTE.
     /// </summary>
     [JsonPropertyName("related_object_type")]
-    public string? RelatedObjectType { get; init; }
+    public string? RelatedObjectType { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaymentLineItemRequest.cs b/src/Merge.Client/Accounting/Types/PaymentLineItemRequest.cs
index 8a54cba8..9e5c12b2 100644
--- a/src/Merge.Client/Accounting/Types/PaymentLineItemRequest.cs
+++ b/src/Merge.Client/Accounting/Types/PaymentLineItemRequest.cs
@@ -4,41 +4,41 @@
 
 namespace Merge.Client.Accounting;
 
-public class PaymentLineItemRequest
+public record PaymentLineItemRequest
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The amount being applied to the transaction.
     /// </summary>
     [JsonPropertyName("applied_amount")]
-    public string? AppliedAmount { get; init; }
+    public string? AppliedAmount { get; set; }
 
     /// <summary>
     /// The date the payment portion is applied.
     /// </summary>
     [JsonPropertyName("applied_date")]
-    public DateTime? AppliedDate { get; init; }
+    public DateTime? AppliedDate { get; set; }
 
     /// <summary>
     /// The Merge ID of the transaction the payment portion is being applied to.
     /// </summary>
     [JsonPropertyName("related_object_id")]
-    public string? RelatedObjectId { get; init; }
+    public string? RelatedObjectId { get; set; }
 
     /// <summary>
     /// The type of transaction the payment portion is being applied to. Possible values include: INVOICE, JOURNAL_ENTRY, or CREDIT_NOTE.
     /// </summary>
     [JsonPropertyName("related_object_type")]
-    public string? RelatedObjectType { get; init; }
+    public string? RelatedObjectType { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaymentRequest.cs b/src/Merge.Client/Accounting/Types/PaymentRequest.cs
index 603d4ef1..84066764 100644
--- a/src/Merge.Client/Accounting/Types/PaymentRequest.cs
+++ b/src/Merge.Client/Accounting/Types/PaymentRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,27 +6,27 @@
 
 namespace Merge.Client.Accounting;
 
-public class PaymentRequest
+public record PaymentRequest
 {
     /// <summary>
     /// The payment's transaction date.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// The supplier, or customer involved in the payment.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The supplier’s or customer’s account in which the payment is made.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The payment's currency.
@@ -340,26 +339,26 @@ public class PaymentRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The payment's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the payment belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The total amount of money being paid to the supplier, or customer, after taxes.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The type of the invoice.
@@ -368,7 +367,7 @@ public class PaymentRequest
     /// - `ACCOUNTS_RECEIVABLE` - ACCOUNTS_RECEIVABLE
     /// </summary>
     [JsonPropertyName("type")]
-    public PaymentTypeEnum? Type { get; init; }
+    public PaymentTypeEnum? Type { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -377,14 +376,14 @@ public class PaymentRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// The accounting period that the Payment was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     /// <summary>
     /// A list of “Payment Applied to Lines” objects.
@@ -396,11 +395,11 @@ public class PaymentRequest
             OneOfSerializer<OneOf<string, PaymentLineItemRequest>>
         >)
     )]
-    public IEnumerable<OneOf<string, PaymentLineItemRequest>>? AppliedToLines { get; init; }
+    public IEnumerable<OneOf<string, PaymentLineItemRequest>>? AppliedToLines { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaymentResponse.cs b/src/Merge.Client/Accounting/Types/PaymentResponse.cs
index 18637c6a..c53e23c3 100644
--- a/src/Merge.Client/Accounting/Types/PaymentResponse.cs
+++ b/src/Merge.Client/Accounting/Types/PaymentResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PaymentResponse
+public record PaymentResponse
 {
     [JsonPropertyName("model")]
-    public Payment Model { get; init; }
+    public required Payment Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PaymentTypeEnum.cs b/src/Merge.Client/Accounting/Types/PaymentTypeEnum.cs
index 77e88391..a3555bb5 100644
--- a/src/Merge.Client/Accounting/Types/PaymentTypeEnum.cs
+++ b/src/Merge.Client/Accounting/Types/PaymentTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/PostingStatusEnum.cs b/src/Merge.Client/Accounting/Types/PostingStatusEnum.cs
index ac6713e9..a36d28b5 100644
--- a/src/Merge.Client/Accounting/Types/PostingStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/PostingStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/PurchaseOrder.cs b/src/Merge.Client/Accounting/Types/PurchaseOrder.cs
index 468bc3a1..5a7fee14 100644
--- a/src/Merge.Client/Accounting/Types/PurchaseOrder.cs
+++ b/src/Merge.Client/Accounting/Types/PurchaseOrder.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,28 +6,28 @@
 
 namespace Merge.Client.Accounting;
 
-public class PurchaseOrder
+public record PurchaseOrder
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The purchase order's status.
@@ -40,64 +39,64 @@ public class PurchaseOrder
     /// - `DELETED` - DELETED
     /// </summary>
     [JsonPropertyName("status")]
-    public PurchaseOrderStatusEnum? Status { get; init; }
+    public PurchaseOrderStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The purchase order's issue date.
     /// </summary>
     [JsonPropertyName("issue_date")]
-    public DateTime? IssueDate { get; init; }
+    public DateTime? IssueDate { get; set; }
 
     /// <summary>
     /// The human-readable number of the purchase order.
     /// </summary>
     [JsonPropertyName("purchase_order_number")]
-    public string? PurchaseOrderNumber { get; init; }
+    public string? PurchaseOrderNumber { get; set; }
 
     /// <summary>
     /// The purchase order's delivery date.
     /// </summary>
     [JsonPropertyName("delivery_date")]
-    public DateTime? DeliveryDate { get; init; }
+    public DateTime? DeliveryDate { get; set; }
 
     /// <summary>
     /// The purchase order's delivery address.
     /// </summary>
     [JsonPropertyName("delivery_address")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Address>>))]
-    public OneOf<string, Address>? DeliveryAddress { get; init; }
+    public OneOf<string, Address>? DeliveryAddress { get; set; }
 
     /// <summary>
     /// The contact making the purchase order.
     /// </summary>
     [JsonPropertyName("customer")]
-    public string? Customer { get; init; }
+    public string? Customer { get; set; }
 
     /// <summary>
     /// The party fulfilling the purchase order.
     /// </summary>
     [JsonPropertyName("vendor")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Vendor { get; init; }
+    public OneOf<string, Contact>? Vendor { get; set; }
 
     /// <summary>
     /// A memo attached to the purchase order.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     /// <summary>
     /// The company the purchase order belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The purchase order's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The purchase order's currency.
@@ -410,16 +409,16 @@ public class PurchaseOrder
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The purchase order's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     [JsonPropertyName("line_items")]
-    public IEnumerable<PurchaseOrderLineItem>? LineItems { get; init; }
+    public IEnumerable<PurchaseOrderLineItem>? LineItems { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -428,36 +427,36 @@ public class PurchaseOrder
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// When the third party's purchase order note was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's purchase order note was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The accounting period that the PurchaseOrder was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PurchaseOrderLineItem.cs b/src/Merge.Client/Accounting/Types/PurchaseOrderLineItem.cs
index 14f6150b..2c3cef1b 100644
--- a/src/Merge.Client/Accounting/Types/PurchaseOrderLineItem.cs
+++ b/src/Merge.Client/Accounting/Types/PurchaseOrderLineItem.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,80 +6,80 @@
 
 namespace Merge.Client.Accounting;
 
-public class PurchaseOrderLineItem
+public record PurchaseOrderLineItem
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// A description of the good being purchased.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The line item's unit price.
     /// </summary>
     [JsonPropertyName("unit_price")]
-    public double? UnitPrice { get; init; }
+    public double? UnitPrice { get; set; }
 
     /// <summary>
     /// The line item's quantity.
     /// </summary>
     [JsonPropertyName("quantity")]
-    public double? Quantity { get; init; }
+    public double? Quantity { get; set; }
 
     [JsonPropertyName("item")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Item>>))]
-    public OneOf<string, Item>? Item { get; init; }
+    public OneOf<string, Item>? Item { get; set; }
 
     /// <summary>
     /// The purchase order line item's account.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// The purchase order line item's associated tracking category.
     /// </summary>
     [JsonPropertyName("tracking_category")]
-    public string? TrackingCategory { get; init; }
+    public string? TrackingCategory { get; set; }
 
     /// <summary>
     /// The purchase order line item's associated tracking categories.
     /// </summary>
     [JsonPropertyName("tracking_categories")]
-    public IEnumerable<string> TrackingCategories { get; init; }
+    public IEnumerable<string> TrackingCategories { get; set; } = new List<string>();
 
     /// <summary>
     /// The purchase order line item's tax amount.
     /// </summary>
     [JsonPropertyName("tax_amount")]
-    public string? TaxAmount { get; init; }
+    public string? TaxAmount { get; set; }
 
     /// <summary>
     /// The purchase order line item's total amount.
     /// </summary>
     [JsonPropertyName("total_line_amount")]
-    public string? TotalLineAmount { get; init; }
+    public string? TotalLineAmount { get; set; }
 
     /// <summary>
     /// The purchase order line item's currency.
@@ -393,23 +392,23 @@ public class PurchaseOrderLineItem
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The purchase order line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the purchase order line item belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PurchaseOrderLineItemRequest.cs b/src/Merge.Client/Accounting/Types/PurchaseOrderLineItemRequest.cs
index 674be8df..03fbb4b2 100644
--- a/src/Merge.Client/Accounting/Types/PurchaseOrderLineItemRequest.cs
+++ b/src/Merge.Client/Accounting/Types/PurchaseOrderLineItemRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,65 +6,65 @@
 
 namespace Merge.Client.Accounting;
 
-public class PurchaseOrderLineItemRequest
+public record PurchaseOrderLineItemRequest
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A description of the good being purchased.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The line item's unit price.
     /// </summary>
     [JsonPropertyName("unit_price")]
-    public double? UnitPrice { get; init; }
+    public double? UnitPrice { get; set; }
 
     /// <summary>
     /// The line item's quantity.
     /// </summary>
     [JsonPropertyName("quantity")]
-    public double? Quantity { get; init; }
+    public double? Quantity { get; set; }
 
     [JsonPropertyName("item")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Item>>))]
-    public OneOf<string, Item>? Item { get; init; }
+    public OneOf<string, Item>? Item { get; set; }
 
     /// <summary>
     /// The purchase order line item's account.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// The purchase order line item's associated tracking category.
     /// </summary>
     [JsonPropertyName("tracking_category")]
-    public string? TrackingCategory { get; init; }
+    public string? TrackingCategory { get; set; }
 
     /// <summary>
     /// The purchase order line item's associated tracking categories.
     /// </summary>
     [JsonPropertyName("tracking_categories")]
-    public IEnumerable<string> TrackingCategories { get; init; }
+    public IEnumerable<string> TrackingCategories { get; set; } = new List<string>();
 
     /// <summary>
     /// The purchase order line item's tax amount.
     /// </summary>
     [JsonPropertyName("tax_amount")]
-    public string? TaxAmount { get; init; }
+    public string? TaxAmount { get; set; }
 
     /// <summary>
     /// The purchase order line item's total amount.
     /// </summary>
     [JsonPropertyName("total_line_amount")]
-    public string? TotalLineAmount { get; init; }
+    public string? TotalLineAmount { get; set; }
 
     /// <summary>
     /// The purchase order line item's currency.
@@ -378,23 +377,23 @@ public class PurchaseOrderLineItemRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The purchase order line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the purchase order line item belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PurchaseOrderRequest.cs b/src/Merge.Client/Accounting/Types/PurchaseOrderRequest.cs
index 994764f6..12684d3a 100644
--- a/src/Merge.Client/Accounting/Types/PurchaseOrderRequest.cs
+++ b/src/Merge.Client/Accounting/Types/PurchaseOrderRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,7 +6,7 @@
 
 namespace Merge.Client.Accounting;
 
-public class PurchaseOrderRequest
+public record PurchaseOrderRequest
 {
     /// <summary>
     /// The purchase order's status.
@@ -19,58 +18,58 @@ public class PurchaseOrderRequest
     /// - `DELETED` - DELETED
     /// </summary>
     [JsonPropertyName("status")]
-    public PurchaseOrderStatusEnum? Status { get; init; }
+    public PurchaseOrderStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The purchase order's issue date.
     /// </summary>
     [JsonPropertyName("issue_date")]
-    public DateTime? IssueDate { get; init; }
+    public DateTime? IssueDate { get; set; }
 
     /// <summary>
     /// The purchase order's delivery date.
     /// </summary>
     [JsonPropertyName("delivery_date")]
-    public DateTime? DeliveryDate { get; init; }
+    public DateTime? DeliveryDate { get; set; }
 
     /// <summary>
     /// The purchase order's delivery address.
     /// </summary>
     [JsonPropertyName("delivery_address")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Address>>))]
-    public OneOf<string, Address>? DeliveryAddress { get; init; }
+    public OneOf<string, Address>? DeliveryAddress { get; set; }
 
     /// <summary>
     /// The contact making the purchase order.
     /// </summary>
     [JsonPropertyName("customer")]
-    public string? Customer { get; init; }
+    public string? Customer { get; set; }
 
     /// <summary>
     /// The party fulfilling the purchase order.
     /// </summary>
     [JsonPropertyName("vendor")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Vendor { get; init; }
+    public OneOf<string, Contact>? Vendor { get; set; }
 
     /// <summary>
     /// A memo attached to the purchase order.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     /// <summary>
     /// The company the purchase order belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// The purchase order's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The purchase order's currency.
@@ -383,13 +382,13 @@ public class PurchaseOrderRequest
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The purchase order's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -398,14 +397,14 @@ public class PurchaseOrderRequest
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     [JsonPropertyName("line_items")]
-    public IEnumerable<PurchaseOrderLineItemRequest>? LineItems { get; init; }
+    public IEnumerable<PurchaseOrderLineItemRequest>? LineItems { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PurchaseOrderResponse.cs b/src/Merge.Client/Accounting/Types/PurchaseOrderResponse.cs
index 92c1c6d3..5d6dc67a 100644
--- a/src/Merge.Client/Accounting/Types/PurchaseOrderResponse.cs
+++ b/src/Merge.Client/Accounting/Types/PurchaseOrderResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class PurchaseOrderResponse
+public record PurchaseOrderResponse
 {
     [JsonPropertyName("model")]
-    public PurchaseOrder Model { get; init; }
+    public required PurchaseOrder Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/PurchaseOrderStatusEnum.cs b/src/Merge.Client/Accounting/Types/PurchaseOrderStatusEnum.cs
index 3d5f2107..6c35deb1 100644
--- a/src/Merge.Client/Accounting/Types/PurchaseOrderStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/PurchaseOrderStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/RemoteData.cs b/src/Merge.Client/Accounting/Types/RemoteData.cs
index 4faefec9..d06ad450 100644
--- a/src/Merge.Client/Accounting/Types/RemoteData.cs
+++ b/src/Merge.Client/Accounting/Types/RemoteData.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Accounting;
 
-public class RemoteData
+public record RemoteData
 {
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("data")]
-    public object? Data { get; init; }
+    public object? Data { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/RemoteEndpointInfo.cs b/src/Merge.Client/Accounting/Types/RemoteEndpointInfo.cs
index 99c1fd1d..d35356a2 100644
--- a/src/Merge.Client/Accounting/Types/RemoteEndpointInfo.cs
+++ b/src/Merge.Client/Accounting/Types/RemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Accounting;
 
-public class RemoteEndpointInfo
+public record RemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string UrlPath { get; init; }
+    public required string UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<object> FieldTraversalPath { get; init; }
+    public IEnumerable<object> FieldTraversalPath { get; set; } = new List<object>();
 }
diff --git a/src/Merge.Client/Accounting/Types/RemoteFieldApi.cs b/src/Merge.Client/Accounting/Types/RemoteFieldApi.cs
index e48c4c30..b03d46c2 100644
--- a/src/Merge.Client/Accounting/Types/RemoteFieldApi.cs
+++ b/src/Merge.Client/Accounting/Types/RemoteFieldApi.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,24 +6,24 @@
 
 namespace Merge.Client.Accounting;
 
-public class RemoteFieldApi
+public record RemoteFieldApi
 {
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("remote_endpoint_info")]
-    public RemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required RemoteEndpointInfo RemoteEndpointInfo { get; set; }
 
     [JsonPropertyName("example_values")]
-    public IEnumerable<object> ExampleValues { get; init; }
+    public IEnumerable<object> ExampleValues { get; set; } = new List<object>();
 
     [JsonPropertyName("advanced_metadata")]
-    public AdvancedMetadata? AdvancedMetadata { get; init; }
+    public AdvancedMetadata? AdvancedMetadata { get; set; }
 
     [JsonPropertyName("coverage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<int, double>>))]
-    public OneOf<int, double>? Coverage { get; init; }
+    public OneOf<int, double>? Coverage { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/RemoteFieldApiResponse.cs b/src/Merge.Client/Accounting/Types/RemoteFieldApiResponse.cs
index 5dbe3562..a0525565 100644
--- a/src/Merge.Client/Accounting/Types/RemoteFieldApiResponse.cs
+++ b/src/Merge.Client/Accounting/Types/RemoteFieldApiResponse.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class RemoteFieldApiResponse
+public record RemoteFieldApiResponse
 {
     [JsonPropertyName("Account")]
-    public IEnumerable<RemoteFieldApi>? Account { get; init; }
+    public IEnumerable<RemoteFieldApi>? Account { get; set; }
 
     [JsonPropertyName("AccountingAttachment")]
-    public IEnumerable<RemoteFieldApi>? AccountingAttachment { get; init; }
+    public IEnumerable<RemoteFieldApi>? AccountingAttachment { get; set; }
 
     [JsonPropertyName("BalanceSheet")]
-    public IEnumerable<RemoteFieldApi>? BalanceSheet { get; init; }
+    public IEnumerable<RemoteFieldApi>? BalanceSheet { get; set; }
 
     [JsonPropertyName("CashFlowStatement")]
-    public IEnumerable<RemoteFieldApi>? CashFlowStatement { get; init; }
+    public IEnumerable<RemoteFieldApi>? CashFlowStatement { get; set; }
 
     [JsonPropertyName("CompanyInfo")]
-    public IEnumerable<RemoteFieldApi>? CompanyInfo { get; init; }
+    public IEnumerable<RemoteFieldApi>? CompanyInfo { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<RemoteFieldApi>? Contact { get; init; }
+    public IEnumerable<RemoteFieldApi>? Contact { get; set; }
 
     [JsonPropertyName("IncomeStatement")]
-    public IEnumerable<RemoteFieldApi>? IncomeStatement { get; init; }
+    public IEnumerable<RemoteFieldApi>? IncomeStatement { get; set; }
 
     [JsonPropertyName("CreditNote")]
-    public IEnumerable<RemoteFieldApi>? CreditNote { get; init; }
+    public IEnumerable<RemoteFieldApi>? CreditNote { get; set; }
 
     [JsonPropertyName("Item")]
-    public IEnumerable<RemoteFieldApi>? Item { get; init; }
+    public IEnumerable<RemoteFieldApi>? Item { get; set; }
 
     [JsonPropertyName("PurchaseOrder")]
-    public IEnumerable<RemoteFieldApi>? PurchaseOrder { get; init; }
+    public IEnumerable<RemoteFieldApi>? PurchaseOrder { get; set; }
 
     [JsonPropertyName("TrackingCategory")]
-    public IEnumerable<RemoteFieldApi>? TrackingCategory { get; init; }
+    public IEnumerable<RemoteFieldApi>? TrackingCategory { get; set; }
 
     [JsonPropertyName("JournalEntry")]
-    public IEnumerable<RemoteFieldApi>? JournalEntry { get; init; }
+    public IEnumerable<RemoteFieldApi>? JournalEntry { get; set; }
 
     [JsonPropertyName("TaxRate")]
-    public IEnumerable<RemoteFieldApi>? TaxRate { get; init; }
+    public IEnumerable<RemoteFieldApi>? TaxRate { get; set; }
 
     [JsonPropertyName("Invoice")]
-    public IEnumerable<RemoteFieldApi>? Invoice { get; init; }
+    public IEnumerable<RemoteFieldApi>? Invoice { get; set; }
 
     [JsonPropertyName("Payment")]
-    public IEnumerable<RemoteFieldApi>? Payment { get; init; }
+    public IEnumerable<RemoteFieldApi>? Payment { get; set; }
 
     [JsonPropertyName("Expense")]
-    public IEnumerable<RemoteFieldApi>? Expense { get; init; }
+    public IEnumerable<RemoteFieldApi>? Expense { get; set; }
 
     [JsonPropertyName("VendorCredit")]
-    public IEnumerable<RemoteFieldApi>? VendorCredit { get; init; }
+    public IEnumerable<RemoteFieldApi>? VendorCredit { get; set; }
 
     [JsonPropertyName("Transaction")]
-    public IEnumerable<RemoteFieldApi>? Transaction { get; init; }
+    public IEnumerable<RemoteFieldApi>? Transaction { get; set; }
 
     [JsonPropertyName("GeneralLedgerTransaction")]
-    public IEnumerable<RemoteFieldApi>? GeneralLedgerTransaction { get; init; }
+    public IEnumerable<RemoteFieldApi>? GeneralLedgerTransaction { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/RemoteKey.cs b/src/Merge.Client/Accounting/Types/RemoteKey.cs
index 4366a69c..648929e6 100644
--- a/src/Merge.Client/Accounting/Types/RemoteKey.cs
+++ b/src/Merge.Client/Accounting/Types/RemoteKey.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Accounting;
 
-public class RemoteKey
+public record RemoteKey
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("key")]
-    public string Key { get; init; }
+    public required string Key { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/RemoteResponse.cs b/src/Merge.Client/Accounting/Types/RemoteResponse.cs
index ae1b9954..360f5542 100644
--- a/src/Merge.Client/Accounting/Types/RemoteResponse.cs
+++ b/src/Merge.Client/Accounting/Types/RemoteResponse.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class RemoteResponse
+public record RemoteResponse
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("status")]
-    public int Status { get; init; }
+    public required int Status { get; set; }
 
     [JsonPropertyName("response")]
-    public object Response { get; init; }
+    public required object Response { get; set; }
 
     [JsonPropertyName("response_headers")]
-    public Dictionary<string, object>? ResponseHeaders { get; init; }
+    public Dictionary<string, object?>? ResponseHeaders { get; set; }
 
     [JsonPropertyName("response_type")]
-    public ResponseTypeEnum? ResponseType { get; init; }
+    public ResponseTypeEnum? ResponseType { get; set; }
 
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ReportItem.cs b/src/Merge.Client/Accounting/Types/ReportItem.cs
index 258918dd..6fc545a8 100644
--- a/src/Merge.Client/Accounting/Types/ReportItem.cs
+++ b/src/Merge.Client/Accounting/Types/ReportItem.cs
@@ -4,44 +4,44 @@
 
 namespace Merge.Client.Accounting;
 
-public class ReportItem
+public record ReportItem
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The report item's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The report item's value.
     /// </summary>
     [JsonPropertyName("value")]
-    public double? Value { get; init; }
+    public double? Value { get; set; }
 
     [JsonPropertyName("sub_items")]
-    public IEnumerable<Dictionary<string, object>>? SubItems { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? SubItems { get; set; }
 
     /// <summary>
     /// The company the report item belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/RequestFormatEnum.cs b/src/Merge.Client/Accounting/Types/RequestFormatEnum.cs
index 1b8cdcff..c35fde95 100644
--- a/src/Merge.Client/Accounting/Types/RequestFormatEnum.cs
+++ b/src/Merge.Client/Accounting/Types/RequestFormatEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/ResponseTypeEnum.cs b/src/Merge.Client/Accounting/Types/ResponseTypeEnum.cs
index d07fb8b5..010c50e7 100644
--- a/src/Merge.Client/Accounting/Types/ResponseTypeEnum.cs
+++ b/src/Merge.Client/Accounting/Types/ResponseTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/RoleEnum.cs b/src/Merge.Client/Accounting/Types/RoleEnum.cs
index c9a563ac..58c9e54c 100644
--- a/src/Merge.Client/Accounting/Types/RoleEnum.cs
+++ b/src/Merge.Client/Accounting/Types/RoleEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/SelectiveSyncConfigurationsUsageEnum.cs b/src/Merge.Client/Accounting/Types/SelectiveSyncConfigurationsUsageEnum.cs
index dd67aaea..73c6be50 100644
--- a/src/Merge.Client/Accounting/Types/SelectiveSyncConfigurationsUsageEnum.cs
+++ b/src/Merge.Client/Accounting/Types/SelectiveSyncConfigurationsUsageEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/Status7D1Enum.cs b/src/Merge.Client/Accounting/Types/Status7D1Enum.cs
index 30bb820c..07ae11b9 100644
--- a/src/Merge.Client/Accounting/Types/Status7D1Enum.cs
+++ b/src/Merge.Client/Accounting/Types/Status7D1Enum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/SyncStatus.cs b/src/Merge.Client/Accounting/Types/SyncStatus.cs
index 0323514f..c554cc4b 100644
--- a/src/Merge.Client/Accounting/Types/SyncStatus.cs
+++ b/src/Merge.Client/Accounting/Types/SyncStatus.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class SyncStatus
+public record SyncStatus
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("last_sync_start")]
-    public DateTime? LastSyncStart { get; init; }
+    public DateTime? LastSyncStart { get; set; }
 
     [JsonPropertyName("next_sync_start")]
-    public DateTime? NextSyncStart { get; init; }
+    public DateTime? NextSyncStart { get; set; }
 
     [JsonPropertyName("status")]
-    public SyncStatusStatusEnum Status { get; init; }
+    public required SyncStatusStatusEnum Status { get; set; }
 
     [JsonPropertyName("is_initial_sync")]
-    public bool IsInitialSync { get; init; }
+    public required bool IsInitialSync { get; set; }
 
     [JsonPropertyName("selective_sync_configurations_usage")]
-    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; init; }
+    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/SyncStatusStatusEnum.cs b/src/Merge.Client/Accounting/Types/SyncStatusStatusEnum.cs
index 54545735..73f62af7 100644
--- a/src/Merge.Client/Accounting/Types/SyncStatusStatusEnum.cs
+++ b/src/Merge.Client/Accounting/Types/SyncStatusStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/Types/TaxRate.cs b/src/Merge.Client/Accounting/Types/TaxRate.cs
index 513ca2de..cb0cc5b0 100644
--- a/src/Merge.Client/Accounting/Types/TaxRate.cs
+++ b/src/Merge.Client/Accounting/Types/TaxRate.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,63 +6,63 @@
 
 namespace Merge.Client.Accounting;
 
-public class TaxRate
+public record TaxRate
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The tax rate's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The tax’s total tax rate - sum of the tax components (not compounded).
     /// </summary>
     [JsonPropertyName("total_tax_rate")]
-    public double? TotalTaxRate { get; init; }
+    public double? TotalTaxRate { get; set; }
 
     /// <summary>
     /// The tax rate’s effective tax rate - total amount of tax with compounding.
     /// </summary>
     [JsonPropertyName("effective_tax_rate")]
-    public double? EffectiveTaxRate { get; init; }
+    public double? EffectiveTaxRate { get; set; }
 
     /// <summary>
     /// The subsidiary that the tax rate belongs to (in the case of multi-entity systems).
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/TrackingCategory.cs b/src/Merge.Client/Accounting/Types/TrackingCategory.cs
index b7cf21c5..af70cb5c 100644
--- a/src/Merge.Client/Accounting/Types/TrackingCategory.cs
+++ b/src/Merge.Client/Accounting/Types/TrackingCategory.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,34 +6,34 @@
 
 namespace Merge.Client.Accounting;
 
-public class TrackingCategory
+public record TrackingCategory
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The tracking category's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The tracking category's status.
@@ -43,7 +42,7 @@ public class TrackingCategory
     /// - `ARCHIVED` - ARCHIVED
     /// </summary>
     [JsonPropertyName("status")]
-    public Status7D1Enum? Status { get; init; }
+    public Status7D1Enum? Status { get; set; }
 
     /// <summary>
     /// The tracking category’s type.
@@ -52,30 +51,30 @@ public class TrackingCategory
     /// - `DEPARTMENT` - DEPARTMENT
     /// </summary>
     [JsonPropertyName("category_type")]
-    public CategoryTypeEnum? CategoryType { get; init; }
+    public CategoryTypeEnum? CategoryType { get; set; }
 
     /// <summary>
     /// ID of the parent tracking category.
     /// </summary>
     [JsonPropertyName("parent_category")]
-    public string? ParentCategory { get; init; }
+    public string? ParentCategory { get; set; }
 
     /// <summary>
     /// The company the tracking category belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/Transaction.cs b/src/Merge.Client/Accounting/Types/Transaction.cs
index d77434da..4328aa80 100644
--- a/src/Merge.Client/Accounting/Types/Transaction.cs
+++ b/src/Merge.Client/Accounting/Types/Transaction.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,66 +6,66 @@
 
 namespace Merge.Client.Accounting;
 
-public class Transaction
+public record Transaction
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The type of transaction, which can by any transaction object not already included in Merge’s common model.
     /// </summary>
     [JsonPropertyName("transaction_type")]
-    public string? TransactionType { get; init; }
+    public string? TransactionType { get; set; }
 
     /// <summary>
     /// The transaction's number used for identifying purposes.
     /// </summary>
     [JsonPropertyName("number")]
-    public string? Number { get; init; }
+    public string? Number { get; set; }
 
     /// <summary>
     /// The date upon which the transaction occurred.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// The transaction's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The contact to whom the transaction relates to.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The total amount being paid after taxes.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public string? TotalAmount { get; init; }
+    public string? TotalAmount { get; set; }
 
     /// <summary>
     /// The transaction's currency.
@@ -379,19 +378,19 @@ public class Transaction
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The transaction's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the transaction belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -400,27 +399,27 @@ public class Transaction
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     [JsonPropertyName("line_items")]
-    public IEnumerable<TransactionLineItem>? LineItems { get; init; }
+    public IEnumerable<TransactionLineItem>? LineItems { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The accounting period that the Transaction was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/TransactionLineItem.cs b/src/Merge.Client/Accounting/Types/TransactionLineItem.cs
index f0f11014..dd2fe85f 100644
--- a/src/Merge.Client/Accounting/Types/TransactionLineItem.cs
+++ b/src/Merge.Client/Accounting/Types/TransactionLineItem.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,77 +6,77 @@
 
 namespace Merge.Client.Accounting;
 
-public class TransactionLineItem
+public record TransactionLineItem
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// An internal note used by the business to clarify purpose of the transaction.
     /// </summary>
     [JsonPropertyName("memo")]
-    public string? Memo { get; init; }
+    public string? Memo { get; set; }
 
     /// <summary>
     /// The line item's unit price.
     /// </summary>
     [JsonPropertyName("unit_price")]
-    public string? UnitPrice { get; init; }
+    public string? UnitPrice { get; set; }
 
     /// <summary>
     /// The line item's quantity.
     /// </summary>
     [JsonPropertyName("quantity")]
-    public string? Quantity { get; init; }
+    public string? Quantity { get; set; }
 
     [JsonPropertyName("item")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Item>>))]
-    public OneOf<string, Item>? Item { get; init; }
+    public OneOf<string, Item>? Item { get; set; }
 
     /// <summary>
     /// The line item's account.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// The line's associated tracking category.
     /// </summary>
     [JsonPropertyName("tracking_category")]
-    public string? TrackingCategory { get; init; }
+    public string? TrackingCategory { get; set; }
 
     /// <summary>
     /// The line's associated tracking categories.
     /// </summary>
     [JsonPropertyName("tracking_categories")]
-    public IEnumerable<string> TrackingCategories { get; init; }
+    public IEnumerable<string> TrackingCategories { get; set; } = new List<string>();
 
     /// <summary>
     /// The line item's total.
     /// </summary>
     [JsonPropertyName("total_line_amount")]
-    public string? TotalLineAmount { get; init; }
+    public string? TotalLineAmount { get; set; }
 
     [JsonPropertyName("tax_rate")]
-    public string? TaxRate { get; init; }
+    public string? TaxRate { get; set; }
 
     /// <summary>
     /// The line item's currency.
@@ -390,23 +389,23 @@ public class TransactionLineItem
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the line belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/ValidationProblemSource.cs b/src/Merge.Client/Accounting/Types/ValidationProblemSource.cs
index d8a77e49..102f904c 100644
--- a/src/Merge.Client/Accounting/Types/ValidationProblemSource.cs
+++ b/src/Merge.Client/Accounting/Types/ValidationProblemSource.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Accounting;
 
-public class ValidationProblemSource
+public record ValidationProblemSource
 {
     [JsonPropertyName("pointer")]
-    public string Pointer { get; init; }
+    public required string Pointer { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/VendorCredit.cs b/src/Merge.Client/Accounting/Types/VendorCredit.cs
index 4a0c025c..5bdeefb7 100644
--- a/src/Merge.Client/Accounting/Types/VendorCredit.cs
+++ b/src/Merge.Client/Accounting/Types/VendorCredit.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,53 +6,53 @@
 
 namespace Merge.Client.Accounting;
 
-public class VendorCredit
+public record VendorCredit
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The vendor credit's number.
     /// </summary>
     [JsonPropertyName("number")]
-    public string? Number { get; init; }
+    public string? Number { get; set; }
 
     /// <summary>
     /// The vendor credit's transaction date.
     /// </summary>
     [JsonPropertyName("transaction_date")]
-    public DateTime? TransactionDate { get; init; }
+    public DateTime? TransactionDate { get; set; }
 
     /// <summary>
     /// The vendor that owes the gift or refund.
     /// </summary>
     [JsonPropertyName("vendor")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Vendor { get; init; }
+    public OneOf<string, Contact>? Vendor { get; set; }
 
     /// <summary>
     /// The vendor credit's total amount.
     /// </summary>
     [JsonPropertyName("total_amount")]
-    public double? TotalAmount { get; init; }
+    public double? TotalAmount { get; set; }
 
     /// <summary>
     /// The vendor credit's currency.
@@ -366,23 +365,23 @@ public class VendorCredit
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("currency")]
-    public CurrencyEnum? Currency { get; init; }
+    public CurrencyEnum? Currency { get; set; }
 
     /// <summary>
     /// The vendor credit's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// The company the vendor credit belongs to.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, CompanyInfo>>))]
-    public OneOf<string, CompanyInfo>? Company { get; init; }
+    public OneOf<string, CompanyInfo>? Company { get; set; }
 
     [JsonPropertyName("lines")]
-    public IEnumerable<VendorCreditLine>? Lines { get; init; }
+    public IEnumerable<VendorCreditLine>? Lines { get; set; }
 
     [JsonPropertyName("tracking_categories")]
     [JsonConverter(
@@ -391,24 +390,24 @@ public class VendorCredit
             OneOfSerializer<OneOf<string, TrackingCategory>>
         >)
     )]
-    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; init; }
+    public IEnumerable<OneOf<string, TrackingCategory>>? TrackingCategories { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The accounting period that the VendorCredit was generated in.
     /// </summary>
     [JsonPropertyName("accounting_period")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AccountingPeriod>>))]
-    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; init; }
+    public OneOf<string, AccountingPeriod>? AccountingPeriod { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/VendorCreditLine.cs b/src/Merge.Client/Accounting/Types/VendorCreditLine.cs
index 5ef87610..ed940397 100644
--- a/src/Merge.Client/Accounting/Types/VendorCreditLine.cs
+++ b/src/Merge.Client/Accounting/Types/VendorCreditLine.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,75 +6,75 @@
 
 namespace Merge.Client.Accounting;
 
-public class VendorCreditLine
+public record VendorCreditLine
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The full value of the credit.
     /// </summary>
     [JsonPropertyName("net_amount")]
-    public double? NetAmount { get; init; }
+    public double? NetAmount { get; set; }
 
     /// <summary>
     /// The line's associated tracking category.
     /// </summary>
     [JsonPropertyName("tracking_category")]
-    public string? TrackingCategory { get; init; }
+    public string? TrackingCategory { get; set; }
 
     /// <summary>
     /// The line's associated tracking categories.
     /// </summary>
     [JsonPropertyName("tracking_categories")]
-    public IEnumerable<string> TrackingCategories { get; init; }
+    public IEnumerable<string> TrackingCategories { get; set; } = new List<string>();
 
     /// <summary>
     /// The line's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The line's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The company the line belongs to.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// The vendor credit line item's exchange rate.
     /// </summary>
     [JsonPropertyName("exchange_rate")]
-    public string? ExchangeRate { get; init; }
+    public string? ExchangeRate { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/WarningValidationProblem.cs b/src/Merge.Client/Accounting/Types/WarningValidationProblem.cs
index 01b239a1..e915f612 100644
--- a/src/Merge.Client/Accounting/Types/WarningValidationProblem.cs
+++ b/src/Merge.Client/Accounting/Types/WarningValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 
 #nullable enable
 
 namespace Merge.Client.Accounting;
 
-public class WarningValidationProblem
+public record WarningValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/Types/WebhookReceiver.cs b/src/Merge.Client/Accounting/Types/WebhookReceiver.cs
index 1a7f1f9a..7c1e1687 100644
--- a/src/Merge.Client/Accounting/Types/WebhookReceiver.cs
+++ b/src/Merge.Client/Accounting/Types/WebhookReceiver.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Accounting;
 
-public class WebhookReceiver
+public record WebhookReceiver
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/VendorCredits/Requests/VendorCreditsListRequest.cs b/src/Merge.Client/Accounting/VendorCredits/Requests/VendorCreditsListRequest.cs
index efe91adc..3e2aeabd 100644
--- a/src/Merge.Client/Accounting/VendorCredits/Requests/VendorCreditsListRequest.cs
+++ b/src/Merge.Client/Accounting/VendorCredits/Requests/VendorCreditsListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class VendorCreditsListRequest
+public record VendorCreditsListRequest
 {
     /// <summary>
     /// If provided, will only return vendor credits for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public VendorCreditsListRequestExpand? Expand { get; init; }
+    public VendorCreditsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? TransactionDateAfter { get; init; }
+    public DateTime? TransactionDateAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? TransactionDateBefore { get; init; }
+    public DateTime? TransactionDateBefore { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/VendorCredits/Requests/VendorCreditsRetrieveRequest.cs b/src/Merge.Client/Accounting/VendorCredits/Requests/VendorCreditsRetrieveRequest.cs
index 2c15b880..ad480006 100644
--- a/src/Merge.Client/Accounting/VendorCredits/Requests/VendorCreditsRetrieveRequest.cs
+++ b/src/Merge.Client/Accounting/VendorCredits/Requests/VendorCreditsRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Accounting;
-
-#nullable enable
-
 namespace Merge.Client.Accounting;
 
-public class VendorCreditsRetrieveRequest
+public record VendorCreditsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public VendorCreditsRetrieveRequestExpand? Expand { get; init; }
+    public VendorCreditsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/VendorCredits/Types/VendorCreditsListRequestExpand.cs b/src/Merge.Client/Accounting/VendorCredits/Types/VendorCreditsListRequestExpand.cs
index 31ccfb53..a86d717a 100644
--- a/src/Merge.Client/Accounting/VendorCredits/Types/VendorCreditsListRequestExpand.cs
+++ b/src/Merge.Client/Accounting/VendorCredits/Types/VendorCreditsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/VendorCredits/Types/VendorCreditsRetrieveRequestExpand.cs b/src/Merge.Client/Accounting/VendorCredits/Types/VendorCreditsRetrieveRequestExpand.cs
index f2d3c75e..2d69ddf4 100644
--- a/src/Merge.Client/Accounting/VendorCredits/Types/VendorCreditsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Accounting/VendorCredits/Types/VendorCreditsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Accounting;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Accounting/VendorCredits/VendorCreditsClient.cs b/src/Merge.Client/Accounting/VendorCredits/VendorCreditsClient.cs
index 377790c7..a3e11b8f 100644
--- a/src/Merge.Client/Accounting/VendorCredits/VendorCreditsClient.cs
+++ b/src/Merge.Client/Accounting/VendorCredits/VendorCreditsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public VendorCreditsClient(RawClient client)
     /// <summary>
     /// Returns a list of `VendorCredit` objects.
     /// </summary>
-    public async Task<PaginatedVendorCreditList> ListAsync(VendorCreditsListRequest request)
+    public async Task<PaginatedVendorCreditList> ListAsync(
+        VendorCreditsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedVendorCreditList> ListAsync(VendorCreditsListRequest
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedVendorCreditList> ListAsync(VendorCreditsListRequest
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -67,32 +76,54 @@ public async Task<PaginatedVendorCreditList> ListAsync(VendorCreditsListRequest
         }
         if (request.TransactionDateAfter != null)
         {
-            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString("o0");
+            _query["transaction_date_after"] = request.TransactionDateAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.TransactionDateBefore != null)
         {
-            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString("o0");
+            _query["transaction_date_before"] = request.TransactionDateBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "accounting/v1/vendor-credits",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedVendorCreditList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedVendorCreditList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `VendorCredit` object with the given `id`.
     /// </summary>
-    public async Task<VendorCredit> RetrieveAsync(string id, VendorCreditsRetrieveRequest request)
+    public async Task<VendorCredit> RetrieveAsync(
+        string id,
+        VendorCreditsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -106,16 +137,30 @@ public async Task<VendorCredit> RetrieveAsync(string id, VendorCreditsRetrieveRe
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"accounting/v1/vendor-credits/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<VendorCredit>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<VendorCredit>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Accounting/WebhookReceivers/Requests/WebhookReceiverRequest.cs b/src/Merge.Client/Accounting/WebhookReceivers/Requests/WebhookReceiverRequest.cs
index 8b9aafc6..2f68372f 100644
--- a/src/Merge.Client/Accounting/WebhookReceivers/Requests/WebhookReceiverRequest.cs
+++ b/src/Merge.Client/Accounting/WebhookReceivers/Requests/WebhookReceiverRequest.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Accounting;
 
-public class WebhookReceiverRequest
+public record WebhookReceiverRequest
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Accounting/WebhookReceivers/WebhookReceiversClient.cs b/src/Merge.Client/Accounting/WebhookReceivers/WebhookReceiversClient.cs
index f0980ce4..bd872177 100644
--- a/src/Merge.Client/Accounting/WebhookReceivers/WebhookReceiversClient.cs
+++ b/src/Merge.Client/Accounting/WebhookReceivers/WebhookReceiversClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Accounting;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,72 @@ public WebhookReceiversClient(RawClient client)
     /// <summary>
     /// Returns a list of `WebhookReceiver` objects.
     /// </summary>
-    public async Task<IEnumerable<WebhookReceiver>> ListAsync()
+    public async Task<IEnumerable<WebhookReceiver>> ListAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "accounting/v1/webhook-receivers"
+                Path = "accounting/v1/webhook-receivers",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<WebhookReceiver>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<WebhookReceiver>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `WebhookReceiver` object with the given values.
     /// </summary>
-    public async Task<WebhookReceiver> CreateAsync(WebhookReceiverRequest request)
+    public async Task<WebhookReceiver> CreateAsync(
+        WebhookReceiverRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "accounting/v1/webhook-receivers",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<WebhookReceiver>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<WebhookReceiver>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/AccountDetails/AccountDetailsClient.cs b/src/Merge.Client/Ats/AccountDetails/AccountDetailsClient.cs
index 558bcd8b..d82fd4dc 100644
--- a/src/Merge.Client/Ats/AccountDetails/AccountDetailsClient.cs
+++ b/src/Merge.Client/Ats/AccountDetails/AccountDetailsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AccountDetailsClient(RawClient client)
     /// <summary>
     /// Get details for a linked account.
     /// </summary>
-    public async Task<AccountDetails> RetrieveAsync()
+    public async Task<AccountDetails> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ats/v1/account-details"
+                Path = "ats/v1/account-details",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountDetails>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountDetails>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/AccountToken/AccountTokenClient.cs b/src/Merge.Client/Ats/AccountToken/AccountTokenClient.cs
index d5c9fb4f..4655f2fd 100644
--- a/src/Merge.Client/Ats/AccountToken/AccountTokenClient.cs
+++ b/src/Merge.Client/Ats/AccountToken/AccountTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,37 @@ public AccountTokenClient(RawClient client)
     /// <summary>
     /// Returns the account token for the end user with the provided public token.
     /// </summary>
-    public async Task<AccountToken> RetrieveAsync(string publicToken)
+    public async Task<AccountToken> RetrieveAsync(
+        string publicToken,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"ats/v1/account-token/{publicToken}"
+                Path = $"ats/v1/account-token/{publicToken}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Activities/ActivitiesClient.cs b/src/Merge.Client/Ats/Activities/ActivitiesClient.cs
index 806e125d..0e03b26e 100644
--- a/src/Merge.Client/Ats/Activities/ActivitiesClient.cs
+++ b/src/Merge.Client/Ats/Activities/ActivitiesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public ActivitiesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Activity` objects.
     /// </summary>
-    public async Task<PaginatedActivityList> ListAsync(ActivitiesListRequest request)
+    public async Task<PaginatedActivityList> ListAsync(
+        ActivitiesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedActivityList> ListAsync(ActivitiesListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -76,23 +85,40 @@ public async Task<PaginatedActivityList> ListAsync(ActivitiesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/activities",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedActivityList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedActivityList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Activity` object with the given values.
     /// </summary>
-    public async Task<ActivityResponse> CreateAsync(ActivityEndpointRequest request)
+    public async Task<ActivityResponse> CreateAsync(
+        ActivityEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -106,23 +132,41 @@ public async Task<ActivityResponse> CreateAsync(ActivityEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/activities",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ActivityResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ActivityResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Activity` object with the given `id`.
     /// </summary>
-    public async Task<Activity> RetrieveAsync(string id, ActivitiesRetrieveRequest request)
+    public async Task<Activity> RetrieveAsync(
+        string id,
+        ActivitiesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -144,36 +188,64 @@ public async Task<Activity> RetrieveAsync(string id, ActivitiesRetrieveRequest r
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/activities/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Activity>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Activity>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Activity` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ats/v1/activities/meta/post"
+                Path = "ats/v1/activities/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Activities/Requests/ActivitiesListRequest.cs b/src/Merge.Client/Ats/Activities/Requests/ActivitiesListRequest.cs
index 5c7c6052..022310b3 100644
--- a/src/Merge.Client/Ats/Activities/Requests/ActivitiesListRequest.cs
+++ b/src/Merge.Client/Ats/Activities/Requests/ActivitiesListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ActivitiesListRequest
+public record ActivitiesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public ActivitiesListRequestRemoteFields? RemoteFields { get; init; }
+    public ActivitiesListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public ActivitiesListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public ActivitiesListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return activities done by this user.
     /// </summary>
-    public string? UserId { get; init; }
+    public string? UserId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Activities/Requests/ActivitiesRetrieveRequest.cs b/src/Merge.Client/Ats/Activities/Requests/ActivitiesRetrieveRequest.cs
index f5439850..1564e346 100644
--- a/src/Merge.Client/Ats/Activities/Requests/ActivitiesRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Activities/Requests/ActivitiesRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ActivitiesRetrieveRequest
+public record ActivitiesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public ActivitiesRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public ActivitiesRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public ActivitiesRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public ActivitiesRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Activities/Requests/ActivityEndpointRequest.cs b/src/Merge.Client/Ats/Activities/Requests/ActivityEndpointRequest.cs
index dc622864..5d172d62 100644
--- a/src/Merge.Client/Ats/Activities/Requests/ActivityEndpointRequest.cs
+++ b/src/Merge.Client/Ats/Activities/Requests/ActivityEndpointRequest.cs
@@ -1,22 +1,18 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ActivityEndpointRequest
+public record ActivityEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public ActivityRequest Model { get; init; }
+    public required ActivityRequest Model { get; set; }
 
-    public string RemoteUserId { get; init; }
+    public required string RemoteUserId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Activities/Types/ActivitiesListRequestRemoteFields.cs b/src/Merge.Client/Ats/Activities/Types/ActivitiesListRequestRemoteFields.cs
index ab68b771..da0d8c4a 100644
--- a/src/Merge.Client/Ats/Activities/Types/ActivitiesListRequestRemoteFields.cs
+++ b/src/Merge.Client/Ats/Activities/Types/ActivitiesListRequestRemoteFields.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Activities/Types/ActivitiesListRequestShowEnumOrigins.cs b/src/Merge.Client/Ats/Activities/Types/ActivitiesListRequestShowEnumOrigins.cs
index d10dce7b..cad967dd 100644
--- a/src/Merge.Client/Ats/Activities/Types/ActivitiesListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Ats/Activities/Types/ActivitiesListRequestShowEnumOrigins.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Activities/Types/ActivitiesRetrieveRequestRemoteFields.cs b/src/Merge.Client/Ats/Activities/Types/ActivitiesRetrieveRequestRemoteFields.cs
index c50b7e38..38e819c4 100644
--- a/src/Merge.Client/Ats/Activities/Types/ActivitiesRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Ats/Activities/Types/ActivitiesRetrieveRequestRemoteFields.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Activities/Types/ActivitiesRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Ats/Activities/Types/ActivitiesRetrieveRequestShowEnumOrigins.cs
index e51d15e2..df3603a3 100644
--- a/src/Merge.Client/Ats/Activities/Types/ActivitiesRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Ats/Activities/Types/ActivitiesRetrieveRequestShowEnumOrigins.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Applications/ApplicationsClient.cs b/src/Merge.Client/Ats/Applications/ApplicationsClient.cs
index 65137382..03d7b214 100644
--- a/src/Merge.Client/Ats/Applications/ApplicationsClient.cs
+++ b/src/Merge.Client/Ats/Applications/ApplicationsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public ApplicationsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Application` objects.
     /// </summary>
-    public async Task<PaginatedApplicationList> ListAsync(ApplicationsListRequest request)
+    public async Task<PaginatedApplicationList> ListAsync(
+        ApplicationsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CandidateId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedApplicationList> ListAsync(ApplicationsListRequest re
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.CreditedToId != null)
         {
@@ -63,11 +68,15 @@ public async Task<PaginatedApplicationList> ListAsync(ApplicationsListRequest re
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -88,23 +97,40 @@ public async Task<PaginatedApplicationList> ListAsync(ApplicationsListRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/applications",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedApplicationList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedApplicationList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Application` object with the given values.
     /// </summary>
-    public async Task<ApplicationResponse> CreateAsync(ApplicationEndpointRequest request)
+    public async Task<ApplicationResponse> CreateAsync(
+        ApplicationEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -118,23 +144,41 @@ public async Task<ApplicationResponse> CreateAsync(ApplicationEndpointRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/applications",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ApplicationResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ApplicationResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Application` object with the given `id`.
     /// </summary>
-    public async Task<Application> RetrieveAsync(string id, ApplicationsRetrieveRequest request)
+    public async Task<Application> RetrieveAsync(
+        string id,
+        ApplicationsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -148,17 +192,31 @@ public async Task<Application> RetrieveAsync(string id, ApplicationsRetrieveRequ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/applications/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Application>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Application>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -166,7 +224,8 @@ public async Task<Application> RetrieveAsync(string id, ApplicationsRetrieveRequ
     /// </summary>
     public async Task<ApplicationResponse> ChangeStageCreateAsync(
         string id,
-        UpdateApplicationStageRequest request
+        UpdateApplicationStageRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -181,24 +240,39 @@ UpdateApplicationStageRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = $"ats/v1/applications/{id}/change-stage",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ApplicationResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ApplicationResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Application` POSTs.
     /// </summary>
     public async Task<MetaResponse> MetaPostRetrieveAsync(
-        ApplicationsMetaPostRetrieveRequest request
+        ApplicationsMetaPostRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -209,16 +283,30 @@ ApplicationsMetaPostRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/applications/meta/post",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Applications/Requests/ApplicationEndpointRequest.cs b/src/Merge.Client/Ats/Applications/Requests/ApplicationEndpointRequest.cs
index 36a92f46..6997310c 100644
--- a/src/Merge.Client/Ats/Applications/Requests/ApplicationEndpointRequest.cs
+++ b/src/Merge.Client/Ats/Applications/Requests/ApplicationEndpointRequest.cs
@@ -1,22 +1,18 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ApplicationEndpointRequest
+public record ApplicationEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public ApplicationRequest Model { get; init; }
+    public required ApplicationRequest Model { get; set; }
 
-    public string RemoteUserId { get; init; }
+    public required string RemoteUserId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Applications/Requests/ApplicationsListRequest.cs b/src/Merge.Client/Ats/Applications/Requests/ApplicationsListRequest.cs
index 00463da3..b3d77628 100644
--- a/src/Merge.Client/Ats/Applications/Requests/ApplicationsListRequest.cs
+++ b/src/Merge.Client/Ats/Applications/Requests/ApplicationsListRequest.cs
@@ -1,88 +1,84 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ApplicationsListRequest
+public record ApplicationsListRequest
 {
     /// <summary>
     /// If provided, will only return applications for this candidate.
     /// </summary>
-    public string? CandidateId { get; init; }
+    public string? CandidateId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return applications credited to this user.
     /// </summary>
-    public string? CreditedToId { get; init; }
+    public string? CreditedToId { get; set; }
 
     /// <summary>
     /// If provided, will only return applications at this interview stage.
     /// </summary>
-    public string? CurrentStageId { get; init; }
+    public string? CurrentStageId { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ApplicationsListRequestExpand? Expand { get; init; }
+    public ApplicationsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return applications for this job.
     /// </summary>
-    public string? JobId { get; init; }
+    public string? JobId { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return applications with this reject reason.
     /// </summary>
-    public string? RejectReasonId { get; init; }
+    public string? RejectReasonId { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return applications with this source.
     /// </summary>
-    public string? Source { get; init; }
+    public string? Source { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Applications/Requests/ApplicationsMetaPostRetrieveRequest.cs b/src/Merge.Client/Ats/Applications/Requests/ApplicationsMetaPostRetrieveRequest.cs
index 13a6bc07..f1557a32 100644
--- a/src/Merge.Client/Ats/Applications/Requests/ApplicationsMetaPostRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Applications/Requests/ApplicationsMetaPostRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ats;
 
-public class ApplicationsMetaPostRetrieveRequest
+public record ApplicationsMetaPostRetrieveRequest
 {
     /// <summary>
     /// The template ID associated with the nested application in the request.
     /// </summary>
-    public string? ApplicationRemoteTemplateId { get; init; }
+    public string? ApplicationRemoteTemplateId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Applications/Requests/ApplicationsRetrieveRequest.cs b/src/Merge.Client/Ats/Applications/Requests/ApplicationsRetrieveRequest.cs
index c239c214..9de3ed7b 100644
--- a/src/Merge.Client/Ats/Applications/Requests/ApplicationsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Applications/Requests/ApplicationsRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ApplicationsRetrieveRequest
+public record ApplicationsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ApplicationsRetrieveRequestExpand? Expand { get; init; }
+    public ApplicationsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Applications/Requests/UpdateApplicationStageRequest.cs b/src/Merge.Client/Ats/Applications/Requests/UpdateApplicationStageRequest.cs
index fa943677..25ff5f09 100644
--- a/src/Merge.Client/Ats/Applications/Requests/UpdateApplicationStageRequest.cs
+++ b/src/Merge.Client/Ats/Applications/Requests/UpdateApplicationStageRequest.cs
@@ -1,21 +1,21 @@
 namespace Merge.Client.Ats;
 
-public class UpdateApplicationStageRequest
+public record UpdateApplicationStageRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
     /// <summary>
     /// The interview stage to move the application to.
     /// </summary>
-    public string? JobInterviewStage { get; init; }
+    public string? JobInterviewStage { get; set; }
 
-    public string? RemoteUserId { get; init; }
+    public string? RemoteUserId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Applications/Types/ApplicationsListRequestExpand.cs b/src/Merge.Client/Ats/Applications/Types/ApplicationsListRequestExpand.cs
index 5cda6d90..4180d20a 100644
--- a/src/Merge.Client/Ats/Applications/Types/ApplicationsListRequestExpand.cs
+++ b/src/Merge.Client/Ats/Applications/Types/ApplicationsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Applications/Types/ApplicationsRetrieveRequestExpand.cs b/src/Merge.Client/Ats/Applications/Types/ApplicationsRetrieveRequestExpand.cs
index a1986106..30f80c17 100644
--- a/src/Merge.Client/Ats/Applications/Types/ApplicationsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ats/Applications/Types/ApplicationsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/AsyncPassthrough/AsyncPassthroughClient.cs b/src/Merge.Client/Ats/AsyncPassthrough/AsyncPassthroughClient.cs
index 47285c6f..b5a06134 100644
--- a/src/Merge.Client/Ats/AsyncPassthrough/AsyncPassthroughClient.cs
+++ b/src/Merge.Client/Ats/AsyncPassthrough/AsyncPassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,75 @@ public AsyncPassthroughClient(RawClient client)
     /// <summary>
     /// Asynchronously pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<AsyncPassthroughReciept> CreateAsync(DataPassthroughRequest request)
+    public async Task<AsyncPassthroughReciept> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/async-passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AsyncPassthroughReciept>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AsyncPassthroughReciept>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Retrieves data from earlier async-passthrough POST request
     /// </summary>
-    public async Task<RemoteResponse> RetrieveAsync(string asyncPassthroughReceiptId)
+    public async Task<RemoteResponse> RetrieveAsync(
+        string asyncPassthroughReceiptId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"ats/v1/async-passthrough/{asyncPassthroughReceiptId}"
+                Path = $"ats/v1/async-passthrough/{asyncPassthroughReceiptId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/AtsClient.cs b/src/Merge.Client/Ats/AtsClient.cs
index b174e3da..4964b9f7 100644
--- a/src/Merge.Client/Ats/AtsClient.cs
+++ b/src/Merge.Client/Ats/AtsClient.cs
@@ -1,5 +1,4 @@
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ats/Attachments/AttachmentsClient.cs b/src/Merge.Client/Ats/Attachments/AttachmentsClient.cs
index 5cc91c35..0d9ddeb9 100644
--- a/src/Merge.Client/Ats/Attachments/AttachmentsClient.cs
+++ b/src/Merge.Client/Ats/Attachments/AttachmentsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AttachmentsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Attachment` objects.
     /// </summary>
-    public async Task<PaginatedAttachmentList> ListAsync(AttachmentsListRequest request)
+    public async Task<PaginatedAttachmentList> ListAsync(
+        AttachmentsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CandidateId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedAttachmentList> ListAsync(AttachmentsListRequest requ
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedAttachmentList> ListAsync(AttachmentsListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -76,23 +85,40 @@ public async Task<PaginatedAttachmentList> ListAsync(AttachmentsListRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/attachments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAttachmentList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAttachmentList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Attachment` object with the given values.
     /// </summary>
-    public async Task<AttachmentResponse> CreateAsync(AttachmentEndpointRequest request)
+    public async Task<AttachmentResponse> CreateAsync(
+        AttachmentEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -106,23 +132,41 @@ public async Task<AttachmentResponse> CreateAsync(AttachmentEndpointRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/attachments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AttachmentResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AttachmentResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Attachment` object with the given `id`.
     /// </summary>
-    public async Task<Attachment> RetrieveAsync(string id, AttachmentsRetrieveRequest request)
+    public async Task<Attachment> RetrieveAsync(
+        string id,
+        AttachmentsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -144,36 +188,64 @@ public async Task<Attachment> RetrieveAsync(string id, AttachmentsRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/attachments/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Attachment>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Attachment>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Attachment` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ats/v1/attachments/meta/post"
+                Path = "ats/v1/attachments/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Attachments/Requests/AttachmentEndpointRequest.cs b/src/Merge.Client/Ats/Attachments/Requests/AttachmentEndpointRequest.cs
index dfee093a..3a442498 100644
--- a/src/Merge.Client/Ats/Attachments/Requests/AttachmentEndpointRequest.cs
+++ b/src/Merge.Client/Ats/Attachments/Requests/AttachmentEndpointRequest.cs
@@ -1,22 +1,18 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class AttachmentEndpointRequest
+public record AttachmentEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public AttachmentRequest Model { get; init; }
+    public required AttachmentRequest Model { get; set; }
 
-    public string RemoteUserId { get; init; }
+    public required string RemoteUserId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Attachments/Requests/AttachmentsListRequest.cs b/src/Merge.Client/Ats/Attachments/Requests/AttachmentsListRequest.cs
index c20006bc..573f44f3 100644
--- a/src/Merge.Client/Ats/Attachments/Requests/AttachmentsListRequest.cs
+++ b/src/Merge.Client/Ats/Attachments/Requests/AttachmentsListRequest.cs
@@ -1,69 +1,69 @@
 namespace Merge.Client.Ats;
 
-public class AttachmentsListRequest
+public record AttachmentsListRequest
 {
     /// <summary>
     /// If provided, will only return attachments for this candidate.
     /// </summary>
-    public string? CandidateId { get; init; }
+    public string? CandidateId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Attachments/Requests/AttachmentsRetrieveRequest.cs b/src/Merge.Client/Ats/Attachments/Requests/AttachmentsRetrieveRequest.cs
index b19a43be..bbcac28c 100644
--- a/src/Merge.Client/Ats/Attachments/Requests/AttachmentsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Attachments/Requests/AttachmentsRetrieveRequest.cs
@@ -1,24 +1,24 @@
 namespace Merge.Client.Ats;
 
-public class AttachmentsRetrieveRequest
+public record AttachmentsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/AuditTrail/AuditTrailClient.cs b/src/Merge.Client/Ats/AuditTrail/AuditTrailClient.cs
index 47022661..6bb44a65 100644
--- a/src/Merge.Client/Ats/AuditTrail/AuditTrailClient.cs
+++ b/src/Merge.Client/Ats/AuditTrail/AuditTrailClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AuditTrailClient(RawClient client)
     /// <summary>
     /// Gets a list of audit trail events.
     /// </summary>
-    public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest request)
+    public async Task<PaginatedAuditLogEventList> ListAsync(
+        AuditTrailListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -48,16 +51,30 @@ public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/audit-trail",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAuditLogEventList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAuditLogEventList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/AuditTrail/Requests/AuditTrailListRequest.cs b/src/Merge.Client/Ats/AuditTrail/Requests/AuditTrailListRequest.cs
index 033aacd3..c348665f 100644
--- a/src/Merge.Client/Ats/AuditTrail/Requests/AuditTrailListRequest.cs
+++ b/src/Merge.Client/Ats/AuditTrail/Requests/AuditTrailListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Ats;
 
-public class AuditTrailListRequest
+public record AuditTrailListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
     /// <summary>
     /// If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`, `END_USER_CREDENTIALS_ACCESSED`
     /// </summary>
-    public string? EventType { get; init; }
+    public string? EventType { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// If provided, this will return events associated with the specified user email. Please note that the email address reflects the user's email at the time of the event, and may not be their current email.
     /// </summary>
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 }
diff --git a/src/Merge.Client/Ats/AvailableActions/AvailableActionsClient.cs b/src/Merge.Client/Ats/AvailableActions/AvailableActionsClient.cs
index 56e93bdb..8bb62004 100644
--- a/src/Merge.Client/Ats/AvailableActions/AvailableActionsClient.cs
+++ b/src/Merge.Client/Ats/AvailableActions/AvailableActionsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AvailableActionsClient(RawClient client)
     /// <summary>
     /// Returns a list of models and actions available for an account.
     /// </summary>
-    public async Task<AvailableActions> RetrieveAsync()
+    public async Task<AvailableActions> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ats/v1/available-actions"
+                Path = "ats/v1/available-actions",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AvailableActions>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AvailableActions>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Candidates/CandidatesClient.cs b/src/Merge.Client/Ats/Candidates/CandidatesClient.cs
index cbad4285..1ddd03b1 100644
--- a/src/Merge.Client/Ats/Candidates/CandidatesClient.cs
+++ b/src/Merge.Client/Ats/Candidates/CandidatesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public CandidatesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Candidate` objects.
     /// </summary>
-    public async Task<PaginatedCandidateList> ListAsync(CandidatesListRequest request)
+    public async Task<PaginatedCandidateList> ListAsync(
+        CandidatesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedCandidateList> ListAsync(CandidatesListRequest reques
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -80,23 +89,40 @@ public async Task<PaginatedCandidateList> ListAsync(CandidatesListRequest reques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/candidates",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCandidateList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCandidateList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Candidate` object with the given values.
     /// </summary>
-    public async Task<CandidateResponse> CreateAsync(CandidateEndpointRequest request)
+    public async Task<CandidateResponse> CreateAsync(
+        CandidateEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -110,23 +136,41 @@ public async Task<CandidateResponse> CreateAsync(CandidateEndpointRequest reques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/candidates",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CandidateResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CandidateResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Candidate` object with the given `id`.
     /// </summary>
-    public async Task<Candidate> RetrieveAsync(string id, CandidatesRetrieveRequest request)
+    public async Task<Candidate> RetrieveAsync(
+        string id,
+        CandidatesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -140,17 +184,31 @@ public async Task<Candidate> RetrieveAsync(string id, CandidatesRetrieveRequest
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/candidates/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Candidate>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Candidate>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -158,7 +216,8 @@ public async Task<Candidate> RetrieveAsync(string id, CandidatesRetrieveRequest
     /// </summary>
     public async Task<CandidateResponse> PartialUpdateAsync(
         string id,
-        PatchedCandidateEndpointRequest request
+        PatchedCandidateEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -173,71 +232,132 @@ PatchedCandidateEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"ats/v1/candidates/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CandidateResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CandidateResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Ignores a specific row based on the `model_id` in the url. These records will have their properties set to null, and will not be updated in future syncs. The "reason" and "message" fields in the request body will be stored for audit purposes.
     /// </summary>
-    public async void IgnoreCreateAsync(string modelId, IgnoreCommonModelRequest request)
+    public async Task IgnoreCreateAsync(
+        string modelId,
+        IgnoreCommonModelRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = $"ats/v1/candidates/ignore/{modelId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Candidate` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"ats/v1/candidates/meta/patch/{id}"
+                Path = $"ats/v1/candidates/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Candidate` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ats/v1/candidates/meta/post"
+                Path = "ats/v1/candidates/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Candidates/Requests/CandidateEndpointRequest.cs b/src/Merge.Client/Ats/Candidates/Requests/CandidateEndpointRequest.cs
index 6fb23c04..a18be586 100644
--- a/src/Merge.Client/Ats/Candidates/Requests/CandidateEndpointRequest.cs
+++ b/src/Merge.Client/Ats/Candidates/Requests/CandidateEndpointRequest.cs
@@ -1,22 +1,18 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class CandidateEndpointRequest
+public record CandidateEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public CandidateRequest Model { get; init; }
+    public required CandidateRequest Model { get; set; }
 
-    public string RemoteUserId { get; init; }
+    public required string RemoteUserId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Candidates/Requests/CandidatesListRequest.cs b/src/Merge.Client/Ats/Candidates/Requests/CandidatesListRequest.cs
index 26392503..9ac80efc 100644
--- a/src/Merge.Client/Ats/Candidates/Requests/CandidatesListRequest.cs
+++ b/src/Merge.Client/Ats/Candidates/Requests/CandidatesListRequest.cs
@@ -1,78 +1,74 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class CandidatesListRequest
+public record CandidatesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return candidates with these email addresses; multiple addresses can be separated by commas.
     /// </summary>
-    public string? EmailAddresses { get; init; }
+    public string? EmailAddresses { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CandidatesListRequestExpand? Expand { get; init; }
+    public CandidatesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// If provided, will only return candidates with this first name.
     /// </summary>
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return candidates with this last name.
     /// </summary>
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return candidates with these tags; multiple tags can be separated by commas.
     /// </summary>
-    public string? Tags { get; init; }
+    public string? Tags { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Candidates/Requests/CandidatesRetrieveRequest.cs b/src/Merge.Client/Ats/Candidates/Requests/CandidatesRetrieveRequest.cs
index cf28df60..2d2b427a 100644
--- a/src/Merge.Client/Ats/Candidates/Requests/CandidatesRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Candidates/Requests/CandidatesRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class CandidatesRetrieveRequest
+public record CandidatesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CandidatesRetrieveRequestExpand? Expand { get; init; }
+    public CandidatesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Candidates/Requests/IgnoreCommonModelRequest.cs b/src/Merge.Client/Ats/Candidates/Requests/IgnoreCommonModelRequest.cs
index 2196e016..4ddb344b 100644
--- a/src/Merge.Client/Ats/Candidates/Requests/IgnoreCommonModelRequest.cs
+++ b/src/Merge.Client/Ats/Candidates/Requests/IgnoreCommonModelRequest.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class IgnoreCommonModelRequest
+public record IgnoreCommonModelRequest
 {
     [JsonPropertyName("reason")]
-    public ReasonEnum Reason { get; init; }
+    public required ReasonEnum Reason { get; set; }
 
     [JsonPropertyName("message")]
-    public string? Message { get; init; }
+    public string? Message { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Candidates/Requests/PatchedCandidateEndpointRequest.cs b/src/Merge.Client/Ats/Candidates/Requests/PatchedCandidateEndpointRequest.cs
index 2f0f8a6c..5340cf11 100644
--- a/src/Merge.Client/Ats/Candidates/Requests/PatchedCandidateEndpointRequest.cs
+++ b/src/Merge.Client/Ats/Candidates/Requests/PatchedCandidateEndpointRequest.cs
@@ -1,22 +1,18 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class PatchedCandidateEndpointRequest
+public record PatchedCandidateEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PatchedCandidateRequest Model { get; init; }
+    public required PatchedCandidateRequest Model { get; set; }
 
-    public string RemoteUserId { get; init; }
+    public required string RemoteUserId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Candidates/Types/CandidatesListRequestExpand.cs b/src/Merge.Client/Ats/Candidates/Types/CandidatesListRequestExpand.cs
index 64c150ab..c71f3209 100644
--- a/src/Merge.Client/Ats/Candidates/Types/CandidatesListRequestExpand.cs
+++ b/src/Merge.Client/Ats/Candidates/Types/CandidatesListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Candidates/Types/CandidatesRetrieveRequestExpand.cs b/src/Merge.Client/Ats/Candidates/Types/CandidatesRetrieveRequestExpand.cs
index 44e7e672..ea907734 100644
--- a/src/Merge.Client/Ats/Candidates/Types/CandidatesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ats/Candidates/Types/CandidatesRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/DeleteAccount/DeleteAccountClient.cs b/src/Merge.Client/Ats/DeleteAccount/DeleteAccountClient.cs
index 3f1ef205..9e7ccdb5 100644
--- a/src/Merge.Client/Ats/DeleteAccount/DeleteAccountClient.cs
+++ b/src/Merge.Client/Ats/DeleteAccount/DeleteAccountClient.cs
@@ -1,4 +1,5 @@
-using Merge.Client;
+using System.Net.Http;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -16,14 +17,26 @@ public DeleteAccountClient(RawClient client)
     /// <summary>
     /// Delete a linked account.
     /// </summary>
-    public async void DeleteAsync()
+    public async Task DeleteAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "ats/v1/delete-account"
+                Path = "ats/v1/delete-account",
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Departments/DepartmentsClient.cs b/src/Merge.Client/Ats/Departments/DepartmentsClient.cs
index 77c304bc..bf53ac85 100644
--- a/src/Merge.Client/Ats/Departments/DepartmentsClient.cs
+++ b/src/Merge.Client/Ats/Departments/DepartmentsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public DepartmentsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Department` objects.
     /// </summary>
-    public async Task<PaginatedDepartmentList> ListAsync(DepartmentsListRequest request)
+    public async Task<PaginatedDepartmentList> ListAsync(
+        DepartmentsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedDepartmentList> ListAsync(DepartmentsListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedDepartmentList> ListAsync(DepartmentsListRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/departments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedDepartmentList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedDepartmentList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Department` object with the given `id`.
     /// </summary>
-    public async Task<Department> RetrieveAsync(string id, DepartmentsRetrieveRequest request)
+    public async Task<Department> RetrieveAsync(
+        string id,
+        DepartmentsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<Department> RetrieveAsync(string id, DepartmentsRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/departments/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Department>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Department>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Departments/Requests/DepartmentsListRequest.cs b/src/Merge.Client/Ats/Departments/Requests/DepartmentsListRequest.cs
index ba89c818..9ab33162 100644
--- a/src/Merge.Client/Ats/Departments/Requests/DepartmentsListRequest.cs
+++ b/src/Merge.Client/Ats/Departments/Requests/DepartmentsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ats;
 
-public class DepartmentsListRequest
+public record DepartmentsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Departments/Requests/DepartmentsRetrieveRequest.cs b/src/Merge.Client/Ats/Departments/Requests/DepartmentsRetrieveRequest.cs
index a7b83539..ab927019 100644
--- a/src/Merge.Client/Ats/Departments/Requests/DepartmentsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Departments/Requests/DepartmentsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ats;
 
-public class DepartmentsRetrieveRequest
+public record DepartmentsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Eeocs/EeocsClient.cs b/src/Merge.Client/Ats/Eeocs/EeocsClient.cs
index bbccb8ac..0b9d452b 100644
--- a/src/Merge.Client/Ats/Eeocs/EeocsClient.cs
+++ b/src/Merge.Client/Ats/Eeocs/EeocsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public EeocsClient(RawClient client)
     /// <summary>
     /// Returns a list of `EEOC` objects.
     /// </summary>
-    public async Task<PaginatedEeocList> ListAsync(EeocsListRequest request)
+    public async Task<PaginatedEeocList> ListAsync(
+        EeocsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CandidateId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedEeocList> ListAsync(EeocsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedEeocList> ListAsync(EeocsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -76,23 +85,41 @@ public async Task<PaginatedEeocList> ListAsync(EeocsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/eeocs",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedEeocList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedEeocList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `EEOC` object with the given `id`.
     /// </summary>
-    public async Task<Eeoc> RetrieveAsync(string id, EeocsRetrieveRequest request)
+    public async Task<Eeoc> RetrieveAsync(
+        string id,
+        EeocsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -114,16 +141,30 @@ public async Task<Eeoc> RetrieveAsync(string id, EeocsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/eeocs/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Eeoc>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Eeoc>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Eeocs/Requests/EeocsListRequest.cs b/src/Merge.Client/Ats/Eeocs/Requests/EeocsListRequest.cs
index 9e55850c..bcfe609d 100644
--- a/src/Merge.Client/Ats/Eeocs/Requests/EeocsListRequest.cs
+++ b/src/Merge.Client/Ats/Eeocs/Requests/EeocsListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class EeocsListRequest
+public record EeocsListRequest
 {
     /// <summary>
     /// If provided, will only return EEOC info for this candidate.
     /// </summary>
-    public string? CandidateId { get; init; }
+    public string? CandidateId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public EeocsListRequestRemoteFields? RemoteFields { get; init; }
+    public EeocsListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public EeocsListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public EeocsListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Eeocs/Requests/EeocsRetrieveRequest.cs b/src/Merge.Client/Ats/Eeocs/Requests/EeocsRetrieveRequest.cs
index eafcd021..f8a5a078 100644
--- a/src/Merge.Client/Ats/Eeocs/Requests/EeocsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Eeocs/Requests/EeocsRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class EeocsRetrieveRequest
+public record EeocsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public EeocsRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public EeocsRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public EeocsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public EeocsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Eeocs/Types/EeocsListRequestRemoteFields.cs b/src/Merge.Client/Ats/Eeocs/Types/EeocsListRequestRemoteFields.cs
index 664c2174..da03d186 100644
--- a/src/Merge.Client/Ats/Eeocs/Types/EeocsListRequestRemoteFields.cs
+++ b/src/Merge.Client/Ats/Eeocs/Types/EeocsListRequestRemoteFields.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Eeocs/Types/EeocsListRequestShowEnumOrigins.cs b/src/Merge.Client/Ats/Eeocs/Types/EeocsListRequestShowEnumOrigins.cs
index 9d455ef9..1f122edb 100644
--- a/src/Merge.Client/Ats/Eeocs/Types/EeocsListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Ats/Eeocs/Types/EeocsListRequestShowEnumOrigins.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Eeocs/Types/EeocsRetrieveRequestRemoteFields.cs b/src/Merge.Client/Ats/Eeocs/Types/EeocsRetrieveRequestRemoteFields.cs
index 7aab3ac5..62c9a7f7 100644
--- a/src/Merge.Client/Ats/Eeocs/Types/EeocsRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Ats/Eeocs/Types/EeocsRetrieveRequestRemoteFields.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Eeocs/Types/EeocsRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Ats/Eeocs/Types/EeocsRetrieveRequestShowEnumOrigins.cs
index b61c931c..e769d5d3 100644
--- a/src/Merge.Client/Ats/Eeocs/Types/EeocsRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Ats/Eeocs/Types/EeocsRetrieveRequestShowEnumOrigins.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/FieldMapping/FieldMappingClient.cs b/src/Merge.Client/Ats/FieldMapping/FieldMappingClient.cs
index 84b57c66..cfcb280e 100644
--- a/src/Merge.Client/Ats/FieldMapping/FieldMappingClient.cs
+++ b/src/Merge.Client/Ats/FieldMapping/FieldMappingClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,60 +18,112 @@ public FieldMappingClient(RawClient client)
     /// <summary>
     /// Get all Field Mappings for this Linked Account. Field Mappings are mappings between third-party Remote Fields and user defined Merge fields. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
-    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync()
+    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = "ats/v1/field-mappings" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = "ats/v1/field-mappings",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingApiInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingApiInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Create new Field Mappings that will be available after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsCreateAsync(
-        CreateFieldMappingRequest request
+        CreateFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/field-mappings",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Deletes Field Mappings for a Linked Account. All data related to this Field Mapping will be deleted and these changes will be reflected after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
-    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string fieldMappingId)
+    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(
+        string fieldMappingId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Delete,
-                Path = $"ats/v1/field-mappings/{fieldMappingId}"
+                Path = $"ats/v1/field-mappings/{fieldMappingId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -79,30 +131,46 @@ public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsPartialUpdateAsync(
         string fieldMappingId,
-        PatchedEditFieldMappingRequest request
+        PatchedEditFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"ats/v1/field-mappings/{fieldMappingId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all remote fields for a Linked Account. Remote fields are third-party fields that are accessible after initial sync if remote_data is enabled. You can use remote fields to override existing Merge fields or map a new Merge field. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
     public async Task<RemoteFieldApiResponse> RemoteFieldsRetrieveAsync(
-        RemoteFieldsRetrieveRequest request
+        RemoteFieldsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -117,32 +185,66 @@ RemoteFieldsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/remote-fields",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all organization-wide Target Fields, this will not include any Linked Account specific Target Fields. Organization-wide Target Fields are additional fields appended to the Merge Common Model for all Linked Accounts in a category. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/target-fields/).
     /// </summary>
-    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync()
+    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = "ats/v1/target-fields" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = "ats/v1/target-fields",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ExternalTargetFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ExternalTargetFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/FieldMapping/Requests/CreateFieldMappingRequest.cs b/src/Merge.Client/Ats/FieldMapping/Requests/CreateFieldMappingRequest.cs
index e8c8ecdd..7af7e9e1 100644
--- a/src/Merge.Client/Ats/FieldMapping/Requests/CreateFieldMappingRequest.cs
+++ b/src/Merge.Client/Ats/FieldMapping/Requests/CreateFieldMappingRequest.cs
@@ -4,41 +4,41 @@
 
 namespace Merge.Client.Ats;
 
-public class CreateFieldMappingRequest
+public record CreateFieldMappingRequest
 {
     /// <summary>
     /// The name of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_name")]
-    public string TargetFieldName { get; init; }
+    public required string TargetFieldName { get; set; }
 
     /// <summary>
     /// The description of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_description")]
-    public string TargetFieldDescription { get; init; }
+    public required string TargetFieldDescription { get; set; }
 
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object> RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object> RemoteFieldTraversalPath { get; set; } = new List<object>();
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string RemoteMethod { get; init; }
+    public required string RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string RemoteUrlPath { get; init; }
+    public required string RemoteUrlPath { get; set; }
 
     /// <summary>
     /// The name of the Common Model that the remote field corresponds to in a given category.
     /// </summary>
     [JsonPropertyName("common_model_name")]
-    public string CommonModelName { get; init; }
+    public required string CommonModelName { get; set; }
 }
diff --git a/src/Merge.Client/Ats/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs b/src/Merge.Client/Ats/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
index 5e1f12ed..cb1259ce 100644
--- a/src/Merge.Client/Ats/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
+++ b/src/Merge.Client/Ats/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Ats;
 
-public class PatchedEditFieldMappingRequest
+public record PatchedEditFieldMappingRequest
 {
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object>? RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object>? RemoteFieldTraversalPath { get; set; }
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string? RemoteMethod { get; init; }
+    public string? RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string? RemoteUrlPath { get; init; }
+    public string? RemoteUrlPath { get; set; }
 }
diff --git a/src/Merge.Client/Ats/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs b/src/Merge.Client/Ats/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
index a143488d..eba8bb2c 100644
--- a/src/Merge.Client/Ats/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Ats;
 
-public class RemoteFieldsRetrieveRequest
+public record RemoteFieldsRetrieveRequest
 {
     /// <summary>
     /// A comma seperated list of Common Model names. If included, will only return Remote Fields for those Common Models.
     /// </summary>
-    public string? CommonModels { get; init; }
+    public string? CommonModels { get; set; }
 
     /// <summary>
     /// If true, will include example values, where available, for remote fields in the 3rd party platform. These examples come from active data from your customers.
     /// </summary>
-    public string? IncludeExampleValues { get; init; }
+    public string? IncludeExampleValues { get; set; }
 }
diff --git a/src/Merge.Client/Ats/ForceResync/ForceResyncClient.cs b/src/Merge.Client/Ats/ForceResync/ForceResyncClient.cs
index a27b3ac9..9825ff33 100644
--- a/src/Merge.Client/Ats/ForceResync/ForceResyncClient.cs
+++ b/src/Merge.Client/Ats/ForceResync/ForceResyncClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,36 @@ public ForceResyncClient(RawClient client)
     /// <summary>
     /// Force re-sync of all models. This is available for all organizations via the dashboard. Force re-sync is also available programmatically via API for monthly, quarterly, and highest sync frequency customers on the Launch, Professional, or Enterprise plans. Doing so will consume a sync credit for the relevant linked account.
     /// </summary>
-    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync()
+    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "ats/v1/sync-status/resync"
+                Path = "ats/v1/sync-status/resync",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<SyncStatus>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<SyncStatus>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/GenerateKey/GenerateKeyClient.cs b/src/Merge.Client/Ats/GenerateKey/GenerateKeyClient.cs
index a73ea1de..2436d672 100644
--- a/src/Merge.Client/Ats/GenerateKey/GenerateKeyClient.cs
+++ b/src/Merge.Client/Ats/GenerateKey/GenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public GenerateKeyClient(RawClient client)
     /// <summary>
     /// Create a remote key.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(GenerateRemoteKeyRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        GenerateRemoteKeyRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/generate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/GenerateKey/Requests/GenerateRemoteKeyRequest.cs b/src/Merge.Client/Ats/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
index 6ae35eb6..b8bc4053 100644
--- a/src/Merge.Client/Ats/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
+++ b/src/Merge.Client/Ats/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ats;
 
-public class GenerateRemoteKeyRequest
+public record GenerateRemoteKeyRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Interviews/InterviewsClient.cs b/src/Merge.Client/Ats/Interviews/InterviewsClient.cs
index c64f68c6..7cfdd3ab 100644
--- a/src/Merge.Client/Ats/Interviews/InterviewsClient.cs
+++ b/src/Merge.Client/Ats/Interviews/InterviewsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public InterviewsClient(RawClient client)
     /// <summary>
     /// Returns a list of `ScheduledInterview` objects.
     /// </summary>
-    public async Task<PaginatedScheduledInterviewList> ListAsync(InterviewsListRequest request)
+    public async Task<PaginatedScheduledInterviewList> ListAsync(
+        InterviewsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.ApplicationId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedScheduledInterviewList> ListAsync(InterviewsListReque
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedScheduledInterviewList> ListAsync(InterviewsListReque
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.OrganizerId != null)
         {
@@ -88,24 +97,39 @@ public async Task<PaginatedScheduledInterviewList> ListAsync(InterviewsListReque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/interviews",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedScheduledInterviewList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedScheduledInterviewList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `ScheduledInterview` object with the given values.
     /// </summary>
     public async Task<ScheduledInterviewResponse> CreateAsync(
-        ScheduledInterviewEndpointRequest request
+        ScheduledInterviewEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -120,17 +144,31 @@ ScheduledInterviewEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/interviews",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ScheduledInterviewResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ScheduledInterviewResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -138,7 +176,8 @@ ScheduledInterviewEndpointRequest request
     /// </summary>
     public async Task<ScheduledInterview> RetrieveAsync(
         string id,
-        InterviewsRetrieveRequest request
+        InterviewsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -161,36 +200,64 @@ InterviewsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/interviews/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ScheduledInterview>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ScheduledInterview>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `ScheduledInterview` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ats/v1/interviews/meta/post"
+                Path = "ats/v1/interviews/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Interviews/Requests/InterviewsListRequest.cs b/src/Merge.Client/Ats/Interviews/Requests/InterviewsListRequest.cs
index 687059e6..ea6df2c0 100644
--- a/src/Merge.Client/Ats/Interviews/Requests/InterviewsListRequest.cs
+++ b/src/Merge.Client/Ats/Interviews/Requests/InterviewsListRequest.cs
@@ -1,88 +1,84 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class InterviewsListRequest
+public record InterviewsListRequest
 {
     /// <summary>
     /// If provided, will only return interviews for this application.
     /// </summary>
-    public string? ApplicationId { get; init; }
+    public string? ApplicationId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public InterviewsListRequestExpand? Expand { get; init; }
+    public InterviewsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, wll only return interviews organized for this job.
     /// </summary>
-    public string? JobId { get; init; }
+    public string? JobId { get; set; }
 
     /// <summary>
     /// If provided, will only return interviews at this stage.
     /// </summary>
-    public string? JobInterviewStageId { get; init; }
+    public string? JobInterviewStageId { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return interviews organized by this user.
     /// </summary>
-    public string? OrganizerId { get; init; }
+    public string? OrganizerId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Interviews/Requests/InterviewsRetrieveRequest.cs b/src/Merge.Client/Ats/Interviews/Requests/InterviewsRetrieveRequest.cs
index 5fb7e5da..30818adb 100644
--- a/src/Merge.Client/Ats/Interviews/Requests/InterviewsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Interviews/Requests/InterviewsRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class InterviewsRetrieveRequest
+public record InterviewsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public InterviewsRetrieveRequestExpand? Expand { get; init; }
+    public InterviewsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Interviews/Requests/ScheduledInterviewEndpointRequest.cs b/src/Merge.Client/Ats/Interviews/Requests/ScheduledInterviewEndpointRequest.cs
index 98fd2e6d..8d5c8ec7 100644
--- a/src/Merge.Client/Ats/Interviews/Requests/ScheduledInterviewEndpointRequest.cs
+++ b/src/Merge.Client/Ats/Interviews/Requests/ScheduledInterviewEndpointRequest.cs
@@ -1,22 +1,18 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ScheduledInterviewEndpointRequest
+public record ScheduledInterviewEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public ScheduledInterviewRequest Model { get; init; }
+    public required ScheduledInterviewRequest Model { get; set; }
 
-    public string RemoteUserId { get; init; }
+    public required string RemoteUserId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Interviews/Types/InterviewsListRequestExpand.cs b/src/Merge.Client/Ats/Interviews/Types/InterviewsListRequestExpand.cs
index 24025d5a..4e5c08e1 100644
--- a/src/Merge.Client/Ats/Interviews/Types/InterviewsListRequestExpand.cs
+++ b/src/Merge.Client/Ats/Interviews/Types/InterviewsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Interviews/Types/InterviewsRetrieveRequestExpand.cs b/src/Merge.Client/Ats/Interviews/Types/InterviewsRetrieveRequestExpand.cs
index 6e9713a3..2e765c76 100644
--- a/src/Merge.Client/Ats/Interviews/Types/InterviewsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ats/Interviews/Types/InterviewsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Issues/IssuesClient.cs b/src/Merge.Client/Ats/Issues/IssuesClient.cs
index 3421f3cc..624845e9 100644
--- a/src/Merge.Client/Ats/Issues/IssuesClient.cs
+++ b/src/Merge.Client/Ats/Issues/IssuesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public IssuesClient(RawClient client)
     /// <summary>
     /// Gets all issues for Organization.
     /// </summary>
-    public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
+    public async Task<PaginatedIssueList> ListAsync(
+        IssuesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountToken != null)
@@ -40,13 +43,13 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         if (request.FirstIncidentTimeAfter != null)
         {
             _query["first_incident_time_after"] = request.FirstIncidentTimeAfter.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.FirstIncidentTimeBefore != null)
         {
             _query["first_incident_time_before"] = request.FirstIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.IncludeMuted != null)
@@ -59,12 +62,14 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         }
         if (request.LastIncidentTimeAfter != null)
         {
-            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString("o0");
+            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.LastIncidentTimeBefore != null)
         {
             _query["last_incident_time_before"] = request.LastIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.LinkedAccountId != null)
@@ -86,32 +91,64 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/issues",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedIssueList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedIssueList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get a specific issue.
     /// </summary>
-    public async Task<Issue> RetrieveAsync(string id)
+    public async Task<Issue> RetrieveAsync(string id, RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = $"ats/v1/issues/{id}" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = $"ats/v1/issues/{id}",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Issue>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Issue>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Issues/Requests/IssuesListRequest.cs b/src/Merge.Client/Ats/Issues/Requests/IssuesListRequest.cs
index b3051357..f9472892 100644
--- a/src/Merge.Client/Ats/Issues/Requests/IssuesListRequest.cs
+++ b/src/Merge.Client/Ats/Issues/Requests/IssuesListRequest.cs
@@ -1,66 +1,62 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class IssuesListRequest
+public record IssuesListRequest
 {
-    public string? AccountToken { get; init; }
+    public string? AccountToken { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was after this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeAfter { get; init; }
+    public DateTime? FirstIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was before this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeBefore { get; init; }
+    public DateTime? FirstIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If true, will include muted issues
     /// </summary>
-    public string? IncludeMuted { get; init; }
+    public string? IncludeMuted { get; set; }
 
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was after this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeAfter { get; init; }
+    public DateTime? LastIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was before this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeBefore { get; init; }
+    public DateTime? LastIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If provided, will only include issues pertaining to the linked account passed in.
     /// </summary>
-    public string? LinkedAccountId { get; init; }
+    public string? LinkedAccountId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -68,5 +64,5 @@ public class IssuesListRequest
     /// - `ONGOING` - ONGOING
     /// - `RESOLVED` - RESOLVED
     /// </summary>
-    public IssuesListRequestStatus? Status { get; init; }
+    public IssuesListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Issues/Types/IssuesListRequestStatus.cs b/src/Merge.Client/Ats/Issues/Types/IssuesListRequestStatus.cs
index bd3915d6..04bb4d52 100644
--- a/src/Merge.Client/Ats/Issues/Types/IssuesListRequestStatus.cs
+++ b/src/Merge.Client/Ats/Issues/Types/IssuesListRequestStatus.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/JobInterviewStages/JobInterviewStagesClient.cs b/src/Merge.Client/Ats/JobInterviewStages/JobInterviewStagesClient.cs
index e853a859..8c0dce4b 100644
--- a/src/Merge.Client/Ats/JobInterviewStages/JobInterviewStagesClient.cs
+++ b/src/Merge.Client/Ats/JobInterviewStages/JobInterviewStagesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,17 +19,20 @@ public JobInterviewStagesClient(RawClient client)
     /// Returns a list of `JobInterviewStage` objects.
     /// </summary>
     public async Task<PaginatedJobInterviewStageList> ListAsync(
-        JobInterviewStagesListRequest request
+        JobInterviewStagesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -53,11 +56,15 @@ JobInterviewStagesListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -70,17 +77,31 @@ JobInterviewStagesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/job-interview-stages",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedJobInterviewStageList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedJobInterviewStageList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -88,7 +109,8 @@ JobInterviewStagesListRequest request
     /// </summary>
     public async Task<JobInterviewStage> RetrieveAsync(
         string id,
-        JobInterviewStagesRetrieveRequest request
+        JobInterviewStagesRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -103,16 +125,30 @@ JobInterviewStagesRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/job-interview-stages/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<JobInterviewStage>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<JobInterviewStage>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/JobInterviewStages/Requests/JobInterviewStagesListRequest.cs b/src/Merge.Client/Ats/JobInterviewStages/Requests/JobInterviewStagesListRequest.cs
index 857b2579..03176946 100644
--- a/src/Merge.Client/Ats/JobInterviewStages/Requests/JobInterviewStagesListRequest.cs
+++ b/src/Merge.Client/Ats/JobInterviewStages/Requests/JobInterviewStagesListRequest.cs
@@ -1,59 +1,59 @@
 namespace Merge.Client.Ats;
 
-public class JobInterviewStagesListRequest
+public record JobInterviewStagesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return interview stages for this job.
     /// </summary>
-    public string? JobId { get; init; }
+    public string? JobId { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/JobInterviewStages/Requests/JobInterviewStagesRetrieveRequest.cs b/src/Merge.Client/Ats/JobInterviewStages/Requests/JobInterviewStagesRetrieveRequest.cs
index 1ebeb01c..f9595038 100644
--- a/src/Merge.Client/Ats/JobInterviewStages/Requests/JobInterviewStagesRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/JobInterviewStages/Requests/JobInterviewStagesRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Ats;
 
-public class JobInterviewStagesRetrieveRequest
+public record JobInterviewStagesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/JobPostings/JobPostingsClient.cs b/src/Merge.Client/Ats/JobPostings/JobPostingsClient.cs
index ddb5fc87..f96caaf8 100644
--- a/src/Merge.Client/Ats/JobPostings/JobPostingsClient.cs
+++ b/src/Merge.Client/Ats/JobPostings/JobPostingsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public JobPostingsClient(RawClient client)
     /// <summary>
     /// Returns a list of `JobPosting` objects.
     /// </summary>
-    public async Task<PaginatedJobPostingList> ListAsync(JobPostingsListRequest request)
+    public async Task<PaginatedJobPostingList> ListAsync(
+        JobPostingsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedJobPostingList> ListAsync(JobPostingsListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -68,23 +77,41 @@ public async Task<PaginatedJobPostingList> ListAsync(JobPostingsListRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/job-postings",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedJobPostingList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedJobPostingList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `JobPosting` object with the given `id`.
     /// </summary>
-    public async Task<JobPosting> RetrieveAsync(string id, JobPostingsRetrieveRequest request)
+    public async Task<JobPosting> RetrieveAsync(
+        string id,
+        JobPostingsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -98,16 +125,30 @@ public async Task<JobPosting> RetrieveAsync(string id, JobPostingsRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/job-postings/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<JobPosting>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<JobPosting>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/JobPostings/Requests/JobPostingsListRequest.cs b/src/Merge.Client/Ats/JobPostings/Requests/JobPostingsListRequest.cs
index cefd296f..7c308e25 100644
--- a/src/Merge.Client/Ats/JobPostings/Requests/JobPostingsListRequest.cs
+++ b/src/Merge.Client/Ats/JobPostings/Requests/JobPostingsListRequest.cs
@@ -1,60 +1,56 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class JobPostingsListRequest
+public record JobPostingsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return Job Postings with this status. Options: ('PUBLISHED', 'CLOSED', 'DRAFT', 'INTERNAL', 'PENDING')
@@ -65,5 +61,5 @@ public class JobPostingsListRequest
     /// - `INTERNAL` - INTERNAL
     /// - `PENDING` - PENDING
     /// </summary>
-    public JobPostingsListRequestStatus? Status { get; init; }
+    public JobPostingsListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Ats/JobPostings/Requests/JobPostingsRetrieveRequest.cs b/src/Merge.Client/Ats/JobPostings/Requests/JobPostingsRetrieveRequest.cs
index f3d1b08e..7d5d9c2f 100644
--- a/src/Merge.Client/Ats/JobPostings/Requests/JobPostingsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/JobPostings/Requests/JobPostingsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Ats;
 
-public class JobPostingsRetrieveRequest
+public record JobPostingsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/JobPostings/Types/JobPostingsListRequestStatus.cs b/src/Merge.Client/Ats/JobPostings/Types/JobPostingsListRequestStatus.cs
index e6c0975d..0a7fa525 100644
--- a/src/Merge.Client/Ats/JobPostings/Types/JobPostingsListRequestStatus.cs
+++ b/src/Merge.Client/Ats/JobPostings/Types/JobPostingsListRequestStatus.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Jobs/JobsClient.cs b/src/Merge.Client/Ats/Jobs/JobsClient.cs
index 79befac6..7e3fa495 100644
--- a/src/Merge.Client/Ats/Jobs/JobsClient.cs
+++ b/src/Merge.Client/Ats/Jobs/JobsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public JobsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Job` objects.
     /// </summary>
-    public async Task<PaginatedJobList> ListAsync(JobsListRequest request)
+    public async Task<PaginatedJobList> ListAsync(
+        JobsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Code != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedJobList> ListAsync(JobsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedJobList> ListAsync(JobsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Offices != null)
         {
@@ -84,23 +93,41 @@ public async Task<PaginatedJobList> ListAsync(JobsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/jobs",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedJobList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedJobList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Job` object with the given `id`.
     /// </summary>
-    public async Task<Job> RetrieveAsync(string id, JobsRetrieveRequest request)
+    public async Task<Job> RetrieveAsync(
+        string id,
+        JobsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -122,17 +149,31 @@ public async Task<Job> RetrieveAsync(string id, JobsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/jobs/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Job>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Job>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -140,7 +181,8 @@ public async Task<Job> RetrieveAsync(string id, JobsRetrieveRequest request)
     /// </summary>
     public async Task<PaginatedScreeningQuestionList> ScreeningQuestionsListAsync(
         string jobId,
-        JobsScreeningQuestionsListRequest request
+        JobsScreeningQuestionsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -167,16 +209,30 @@ JobsScreeningQuestionsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/jobs/{jobId}/screening-questions",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedScreeningQuestionList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedScreeningQuestionList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Jobs/Requests/JobsListRequest.cs b/src/Merge.Client/Ats/Jobs/Requests/JobsListRequest.cs
index 49816442..7b7c2d41 100644
--- a/src/Merge.Client/Ats/Jobs/Requests/JobsListRequest.cs
+++ b/src/Merge.Client/Ats/Jobs/Requests/JobsListRequest.cs
@@ -1,80 +1,76 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class JobsListRequest
+public record JobsListRequest
 {
     /// <summary>
     /// If provided, will only return jobs with this code.
     /// </summary>
-    public string? Code { get; init; }
+    public string? Code { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public JobsListRequestExpand? Expand { get; init; }
+    public JobsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return jobs for this office; multiple offices can be separated by commas.
     /// </summary>
-    public string? Offices { get; init; }
+    public string? Offices { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return jobs with this status. Options: ('OPEN', 'CLOSED', 'DRAFT', 'ARCHIVED', 'PENDING')
@@ -85,5 +81,5 @@ public class JobsListRequest
     /// - `ARCHIVED` - ARCHIVED
     /// - `PENDING` - PENDING
     /// </summary>
-    public JobsListRequestStatus? Status { get; init; }
+    public JobsListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Jobs/Requests/JobsRetrieveRequest.cs b/src/Merge.Client/Ats/Jobs/Requests/JobsRetrieveRequest.cs
index 62a0b3dd..8440825f 100644
--- a/src/Merge.Client/Ats/Jobs/Requests/JobsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Jobs/Requests/JobsRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class JobsRetrieveRequest
+public record JobsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public JobsRetrieveRequestExpand? Expand { get; init; }
+    public JobsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Jobs/Requests/JobsScreeningQuestionsListRequest.cs b/src/Merge.Client/Ats/Jobs/Requests/JobsScreeningQuestionsListRequest.cs
index a9f6173b..92682a79 100644
--- a/src/Merge.Client/Ats/Jobs/Requests/JobsScreeningQuestionsListRequest.cs
+++ b/src/Merge.Client/Ats/Jobs/Requests/JobsScreeningQuestionsListRequest.cs
@@ -1,33 +1,29 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class JobsScreeningQuestionsListRequest
+public record JobsScreeningQuestionsListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public JobsScreeningQuestionsListRequestExpand? Expand { get; init; }
+    public JobsScreeningQuestionsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Jobs/Types/JobsListRequestExpand.cs b/src/Merge.Client/Ats/Jobs/Types/JobsListRequestExpand.cs
index 0547ad88..67a77409 100644
--- a/src/Merge.Client/Ats/Jobs/Types/JobsListRequestExpand.cs
+++ b/src/Merge.Client/Ats/Jobs/Types/JobsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Jobs/Types/JobsListRequestStatus.cs b/src/Merge.Client/Ats/Jobs/Types/JobsListRequestStatus.cs
index db721be7..5fcbf46e 100644
--- a/src/Merge.Client/Ats/Jobs/Types/JobsListRequestStatus.cs
+++ b/src/Merge.Client/Ats/Jobs/Types/JobsListRequestStatus.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Jobs/Types/JobsRetrieveRequestExpand.cs b/src/Merge.Client/Ats/Jobs/Types/JobsRetrieveRequestExpand.cs
index 6f0362e0..f6848e20 100644
--- a/src/Merge.Client/Ats/Jobs/Types/JobsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ats/Jobs/Types/JobsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Jobs/Types/JobsScreeningQuestionsListRequestExpand.cs b/src/Merge.Client/Ats/Jobs/Types/JobsScreeningQuestionsListRequestExpand.cs
index 55bfe545..df3fdfaf 100644
--- a/src/Merge.Client/Ats/Jobs/Types/JobsScreeningQuestionsListRequestExpand.cs
+++ b/src/Merge.Client/Ats/Jobs/Types/JobsScreeningQuestionsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/LinkToken/LinkTokenClient.cs b/src/Merge.Client/Ats/LinkToken/LinkTokenClient.cs
index dfe0239e..cd7f4336 100644
--- a/src/Merge.Client/Ats/LinkToken/LinkTokenClient.cs
+++ b/src/Merge.Client/Ats/LinkToken/LinkTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public LinkTokenClient(RawClient client)
     /// <summary>
     /// Creates a link token to be used when linking a new end user.
     /// </summary>
-    public async Task<LinkToken> CreateAsync(EndUserDetailsRequest request)
+    public async Task<LinkToken> CreateAsync(
+        EndUserDetailsRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/link-token",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<LinkToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<LinkToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/LinkToken/Requests/EndUserDetailsRequest.cs b/src/Merge.Client/Ats/LinkToken/Requests/EndUserDetailsRequest.cs
index 82b7210f..e878067a 100644
--- a/src/Merge.Client/Ats/LinkToken/Requests/EndUserDetailsRequest.cs
+++ b/src/Merge.Client/Ats/LinkToken/Requests/EndUserDetailsRequest.cs
@@ -1,65 +1,64 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class EndUserDetailsRequest
+public record EndUserDetailsRequest
 {
     /// <summary>
     /// Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.
     /// </summary>
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// Your end user's organization.
     /// </summary>
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.
     /// </summary>
     [JsonPropertyName("end_user_origin_id")]
-    public string EndUserOriginId { get; init; }
+    public required string EndUserOriginId { get; set; }
 
     /// <summary>
     /// The integration categories to show in Merge Link.
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     /// <summary>
     /// The slug of a specific pre-selected integration for this linking flow token. For examples of slugs, see https://docs.merge.dev/guides/merge-link/single-integration/.
     /// </summary>
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     /// <summary>
     /// An integer number of minutes between [30, 720 or 10080 if for a Magic Link URL] for how long this token is valid. Defaults to 30.
     /// </summary>
     [JsonPropertyName("link_expiry_mins")]
-    public int? LinkExpiryMins { get; init; }
+    public int? LinkExpiryMins { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("should_create_magic_link_url")]
-    public bool? ShouldCreateMagicLinkUrl { get; init; }
+    public bool? ShouldCreateMagicLinkUrl { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL on the Admin Needed screen during the linking flow. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("hide_admin_magic_link")]
-    public bool? HideAdminMagicLink { get; init; }
+    public bool? HideAdminMagicLink { get; set; }
 
     /// <summary>
     /// An array of objects to specify the models and fields that will be disabled for a given Linked Account. Each object uses model_id, enabled_actions, and disabled_fields to specify the model, method, and fields that are scoped for a given Linked Account.
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; init; }
+    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; set; }
 
     /// <summary>
     /// When creating a Link Token, you can set permissions for Common Models that will apply to the account that is going to be linked. Any model or field not specified in link token payload will default to existing settings.
@@ -68,17 +67,17 @@ public class EndUserDetailsRequest
     public Dictionary<
         string,
         IEnumerable<IndividualCommonModelScopeDeserializerRequest>?
-    >? CategoryCommonModelScopes { get; init; }
+    >? CategoryCommonModelScopes { get; set; }
 
     /// <summary>
     /// The language code for the language to localize Merge Link to.
     /// </summary>
     [JsonPropertyName("language")]
-    public string? Language { get; init; }
+    public string? Language { get; set; }
 
     /// <summary>
     /// A JSON object containing integration-specific configuration options.
     /// </summary>
     [JsonPropertyName("integration_specific_config")]
-    public Dictionary<string, object>? IntegrationSpecificConfig { get; init; }
+    public Dictionary<string, object?>? IntegrationSpecificConfig { get; set; }
 }
diff --git a/src/Merge.Client/Ats/LinkedAccounts/LinkedAccountsClient.cs b/src/Merge.Client/Ats/LinkedAccounts/LinkedAccountsClient.cs
index 5e601afd..29df5ce5 100644
--- a/src/Merge.Client/Ats/LinkedAccounts/LinkedAccountsClient.cs
+++ b/src/Merge.Client/Ats/LinkedAccounts/LinkedAccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,7 +19,8 @@ public LinkedAccountsClient(RawClient client)
     /// List linked accounts for your organization.
     /// </summary>
     public async Task<PaginatedAccountDetailsAndActionsList> ListAsync(
-        LinkedAccountsListRequest request
+        LinkedAccountsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -78,16 +79,30 @@ LinkedAccountsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/linked-accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/LinkedAccounts/Requests/LinkedAccountsListRequest.cs b/src/Merge.Client/Ats/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
index d3423b21..5aa4f998 100644
--- a/src/Merge.Client/Ats/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
+++ b/src/Merge.Client/Ats/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
@@ -1,10 +1,6 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class LinkedAccountsListRequest
+public record LinkedAccountsListRequest
 {
     /// <summary>
     /// Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
@@ -17,62 +13,62 @@ public class LinkedAccountsListRequest
     /// - `mktg` - mktg
     /// - `filestorage` - filestorage
     /// </summary>
-    public LinkedAccountsListRequestCategory? Category { get; init; }
+    public LinkedAccountsListRequestCategory? Category { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given email address.
     /// </summary>
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given organization name.
     /// </summary>
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given origin ID.
     /// </summary>
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     /// <summary>
     /// Comma-separated list of EndUser origin IDs, making it possible to specify multiple EndUsers at once.
     /// </summary>
-    public string? EndUserOriginIds { get; init; }
+    public string? EndUserOriginIds { get; set; }
 
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Comma-separated list of LinkedAccount IDs, making it possible to specify multiple LinkedAccounts at once.
     /// </summary>
-    public string? Ids { get; init; }
+    public string? Ids { get; set; }
 
     /// <summary>
     /// If `true`, will include complete production duplicates of the account specified by the `id` query parameter in the response. `id` must be for a complete production linked account.
     /// </summary>
-    public bool? IncludeDuplicates { get; init; }
+    public bool? IncludeDuplicates { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given integration name.
     /// </summary>
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If included, will only include test linked accounts. If not included, will only include non-test linked accounts.
     /// </summary>
-    public string? IsTestAccount { get; init; }
+    public string? IsTestAccount { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Filter by status. Options: `COMPLETE`, `INCOMPLETE`, `RELINK_NEEDED`
     /// </summary>
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 }
diff --git a/src/Merge.Client/Ats/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs b/src/Merge.Client/Ats/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
index e18cbabf..893860bc 100644
--- a/src/Merge.Client/Ats/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
+++ b/src/Merge.Client/Ats/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Offers/OffersClient.cs b/src/Merge.Client/Ats/Offers/OffersClient.cs
index 42c06bcd..3571bac0 100644
--- a/src/Merge.Client/Ats/Offers/OffersClient.cs
+++ b/src/Merge.Client/Ats/Offers/OffersClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public OffersClient(RawClient client)
     /// <summary>
     /// Returns a list of `Offer` objects.
     /// </summary>
-    public async Task<PaginatedOfferList> ListAsync(OffersListRequest request)
+    public async Task<PaginatedOfferList> ListAsync(
+        OffersListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.ApplicationId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedOfferList> ListAsync(OffersListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.CreatorId != null)
         {
@@ -55,11 +60,15 @@ public async Task<PaginatedOfferList> ListAsync(OffersListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -80,23 +89,41 @@ public async Task<PaginatedOfferList> ListAsync(OffersListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/offers",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedOfferList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedOfferList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Offer` object with the given `id`.
     /// </summary>
-    public async Task<Offer> RetrieveAsync(string id, OffersRetrieveRequest request)
+    public async Task<Offer> RetrieveAsync(
+        string id,
+        OffersRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -118,16 +145,30 @@ public async Task<Offer> RetrieveAsync(string id, OffersRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/offers/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Offer>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Offer>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Offers/Requests/OffersListRequest.cs b/src/Merge.Client/Ats/Offers/Requests/OffersListRequest.cs
index 0f57e6de..956577be 100644
--- a/src/Merge.Client/Ats/Offers/Requests/OffersListRequest.cs
+++ b/src/Merge.Client/Ats/Offers/Requests/OffersListRequest.cs
@@ -1,78 +1,74 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class OffersListRequest
+public record OffersListRequest
 {
     /// <summary>
     /// If provided, will only return offers for this application.
     /// </summary>
-    public string? ApplicationId { get; init; }
+    public string? ApplicationId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return offers created by this user.
     /// </summary>
-    public string? CreatorId { get; init; }
+    public string? CreatorId { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public OffersListRequestExpand? Expand { get; init; }
+    public OffersListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Offers/Requests/OffersRetrieveRequest.cs b/src/Merge.Client/Ats/Offers/Requests/OffersRetrieveRequest.cs
index 3d043960..4bbddbad 100644
--- a/src/Merge.Client/Ats/Offers/Requests/OffersRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Offers/Requests/OffersRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class OffersRetrieveRequest
+public record OffersRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public OffersRetrieveRequestExpand? Expand { get; init; }
+    public OffersRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Offers/Types/OffersListRequestExpand.cs b/src/Merge.Client/Ats/Offers/Types/OffersListRequestExpand.cs
index 231df7ef..1078ee90 100644
--- a/src/Merge.Client/Ats/Offers/Types/OffersListRequestExpand.cs
+++ b/src/Merge.Client/Ats/Offers/Types/OffersListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Offers/Types/OffersRetrieveRequestExpand.cs b/src/Merge.Client/Ats/Offers/Types/OffersRetrieveRequestExpand.cs
index fe186b28..bce2a508 100644
--- a/src/Merge.Client/Ats/Offers/Types/OffersRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ats/Offers/Types/OffersRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Offices/OfficesClient.cs b/src/Merge.Client/Ats/Offices/OfficesClient.cs
index b2ae3565..c6320391 100644
--- a/src/Merge.Client/Ats/Offices/OfficesClient.cs
+++ b/src/Merge.Client/Ats/Offices/OfficesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public OfficesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Office` objects.
     /// </summary>
-    public async Task<PaginatedOfficeList> ListAsync(OfficesListRequest request)
+    public async Task<PaginatedOfficeList> ListAsync(
+        OfficesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedOfficeList> ListAsync(OfficesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedOfficeList> ListAsync(OfficesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/offices",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedOfficeList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedOfficeList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Office` object with the given `id`.
     /// </summary>
-    public async Task<Office> RetrieveAsync(string id, OfficesRetrieveRequest request)
+    public async Task<Office> RetrieveAsync(
+        string id,
+        OfficesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<Office> RetrieveAsync(string id, OfficesRetrieveRequest reques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/offices/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Office>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Office>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Offices/Requests/OfficesListRequest.cs b/src/Merge.Client/Ats/Offices/Requests/OfficesListRequest.cs
index 6e2cb763..c01245d9 100644
--- a/src/Merge.Client/Ats/Offices/Requests/OfficesListRequest.cs
+++ b/src/Merge.Client/Ats/Offices/Requests/OfficesListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ats;
 
-public class OfficesListRequest
+public record OfficesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Offices/Requests/OfficesRetrieveRequest.cs b/src/Merge.Client/Ats/Offices/Requests/OfficesRetrieveRequest.cs
index 072dd78f..e4cb8bbf 100644
--- a/src/Merge.Client/Ats/Offices/Requests/OfficesRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Offices/Requests/OfficesRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ats;
 
-public class OfficesRetrieveRequest
+public record OfficesRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Passthrough/PassthroughClient.cs b/src/Merge.Client/Ats/Passthrough/PassthroughClient.cs
index 03f91c63..c8b6d7a4 100644
--- a/src/Merge.Client/Ats/Passthrough/PassthroughClient.cs
+++ b/src/Merge.Client/Ats/Passthrough/PassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public PassthroughClient(RawClient client)
     /// <summary>
     /// Pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<RemoteResponse> CreateAsync(DataPassthroughRequest request)
+    public async Task<RemoteResponse> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/RegenerateKey/RegenerateKeyClient.cs b/src/Merge.Client/Ats/RegenerateKey/RegenerateKeyClient.cs
index cc5b78b9..5784c858 100644
--- a/src/Merge.Client/Ats/RegenerateKey/RegenerateKeyClient.cs
+++ b/src/Merge.Client/Ats/RegenerateKey/RegenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public RegenerateKeyClient(RawClient client)
     /// <summary>
     /// Exchange remote keys.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(RemoteKeyForRegenerationRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        RemoteKeyForRegenerationRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/regenerate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs b/src/Merge.Client/Ats/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
index 23af2366..3876028f 100644
--- a/src/Merge.Client/Ats/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
+++ b/src/Merge.Client/Ats/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ats;
 
-public class RemoteKeyForRegenerationRequest
+public record RemoteKeyForRegenerationRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Ats/RejectReasons/RejectReasonsClient.cs b/src/Merge.Client/Ats/RejectReasons/RejectReasonsClient.cs
index 0df402ca..d4c3472c 100644
--- a/src/Merge.Client/Ats/RejectReasons/RejectReasonsClient.cs
+++ b/src/Merge.Client/Ats/RejectReasons/RejectReasonsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public RejectReasonsClient(RawClient client)
     /// <summary>
     /// Returns a list of `RejectReason` objects.
     /// </summary>
-    public async Task<PaginatedRejectReasonList> ListAsync(RejectReasonsListRequest request)
+    public async Task<PaginatedRejectReasonList> ListAsync(
+        RejectReasonsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedRejectReasonList> ListAsync(RejectReasonsListRequest
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedRejectReasonList> ListAsync(RejectReasonsListRequest
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/reject-reasons",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRejectReasonList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRejectReasonList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `RejectReason` object with the given `id`.
     /// </summary>
-    public async Task<RejectReason> RetrieveAsync(string id, RejectReasonsRetrieveRequest request)
+    public async Task<RejectReason> RetrieveAsync(
+        string id,
+        RejectReasonsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<RejectReason> RetrieveAsync(string id, RejectReasonsRetrieveRe
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/reject-reasons/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RejectReason>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RejectReason>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/RejectReasons/Requests/RejectReasonsListRequest.cs b/src/Merge.Client/Ats/RejectReasons/Requests/RejectReasonsListRequest.cs
index babb3000..049ce104 100644
--- a/src/Merge.Client/Ats/RejectReasons/Requests/RejectReasonsListRequest.cs
+++ b/src/Merge.Client/Ats/RejectReasons/Requests/RejectReasonsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ats;
 
-public class RejectReasonsListRequest
+public record RejectReasonsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/RejectReasons/Requests/RejectReasonsRetrieveRequest.cs b/src/Merge.Client/Ats/RejectReasons/Requests/RejectReasonsRetrieveRequest.cs
index 44ecbcb9..2f060bd4 100644
--- a/src/Merge.Client/Ats/RejectReasons/Requests/RejectReasonsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/RejectReasons/Requests/RejectReasonsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ats;
 
-public class RejectReasonsRetrieveRequest
+public record RejectReasonsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Ats/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
index 205760ca..d271acf4 100644
--- a/src/Merge.Client/Ats/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Ats/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class LinkedAccountCommonModelScopeDeserializerRequest
+public record LinkedAccountCommonModelScopeDeserializerRequest
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializerRequest>();
 }
diff --git a/src/Merge.Client/Ats/Scopes/ScopesClient.cs b/src/Merge.Client/Ats/Scopes/ScopesClient.cs
index 52b20d8b..01cf070a 100644
--- a/src/Merge.Client/Ats/Scopes/ScopesClient.cs
+++ b/src/Merge.Client/Ats/Scopes/ScopesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,59 +18,110 @@ public ScopesClient(RawClient client)
     /// <summary>
     /// Get the default permissions for Merge Common Models and fields across all Linked Accounts of a given category. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = "ats/v1/default-scopes" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = "ats/v1/default-scopes",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all available permissions for Merge Common Models and fields for a single Linked Account. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ats/v1/linked-account-scopes"
+                Path = "ats/v1/linked-account-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Update permissions for any Common Model or field for a single Linked Account. Any Scopes not set in this POST request will inherit the default Scopes. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes)
     /// </summary>
     public async Task<CommonModelScopeApi> LinkedAccountScopesCreateAsync(
-        LinkedAccountCommonModelScopeDeserializerRequest request
+        LinkedAccountCommonModelScopeDeserializerRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/linked-account-scopes",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Scorecards/Requests/ScorecardsListRequest.cs b/src/Merge.Client/Ats/Scorecards/Requests/ScorecardsListRequest.cs
index 4ac616a1..8e8b4cea 100644
--- a/src/Merge.Client/Ats/Scorecards/Requests/ScorecardsListRequest.cs
+++ b/src/Merge.Client/Ats/Scorecards/Requests/ScorecardsListRequest.cs
@@ -1,83 +1,79 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ScorecardsListRequest
+public record ScorecardsListRequest
 {
     /// <summary>
     /// If provided, will only return scorecards for this application.
     /// </summary>
-    public string? ApplicationId { get; init; }
+    public string? ApplicationId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ScorecardsListRequestExpand? Expand { get; init; }
+    public ScorecardsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return scorecards for this interview.
     /// </summary>
-    public string? InterviewId { get; init; }
+    public string? InterviewId { get; set; }
 
     /// <summary>
     /// If provided, will only return scorecards for this interviewer.
     /// </summary>
-    public string? InterviewerId { get; init; }
+    public string? InterviewerId { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Scorecards/Requests/ScorecardsRetrieveRequest.cs b/src/Merge.Client/Ats/Scorecards/Requests/ScorecardsRetrieveRequest.cs
index eb1b0cf0..d6aa3230 100644
--- a/src/Merge.Client/Ats/Scorecards/Requests/ScorecardsRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Scorecards/Requests/ScorecardsRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Ats;
-
-#nullable enable
-
 namespace Merge.Client.Ats;
 
-public class ScorecardsRetrieveRequest
+public record ScorecardsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ScorecardsRetrieveRequestExpand? Expand { get; init; }
+    public ScorecardsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Scorecards/ScorecardsClient.cs b/src/Merge.Client/Ats/Scorecards/ScorecardsClient.cs
index e35caa75..f121b84b 100644
--- a/src/Merge.Client/Ats/Scorecards/ScorecardsClient.cs
+++ b/src/Merge.Client/Ats/Scorecards/ScorecardsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public ScorecardsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Scorecard` objects.
     /// </summary>
-    public async Task<PaginatedScorecardList> ListAsync(ScorecardsListRequest request)
+    public async Task<PaginatedScorecardList> ListAsync(
+        ScorecardsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.ApplicationId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedScorecardList> ListAsync(ScorecardsListRequest reques
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedScorecardList> ListAsync(ScorecardsListRequest reques
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -84,23 +93,41 @@ public async Task<PaginatedScorecardList> ListAsync(ScorecardsListRequest reques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/scorecards",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedScorecardList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedScorecardList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Scorecard` object with the given `id`.
     /// </summary>
-    public async Task<Scorecard> RetrieveAsync(string id, ScorecardsRetrieveRequest request)
+    public async Task<Scorecard> RetrieveAsync(
+        string id,
+        ScorecardsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -122,16 +149,30 @@ public async Task<Scorecard> RetrieveAsync(string id, ScorecardsRetrieveRequest
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/scorecards/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Scorecard>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Scorecard>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Scorecards/Types/ScorecardsListRequestExpand.cs b/src/Merge.Client/Ats/Scorecards/Types/ScorecardsListRequestExpand.cs
index 50c5e5b3..552fa94a 100644
--- a/src/Merge.Client/Ats/Scorecards/Types/ScorecardsListRequestExpand.cs
+++ b/src/Merge.Client/Ats/Scorecards/Types/ScorecardsListRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Scorecards/Types/ScorecardsRetrieveRequestExpand.cs b/src/Merge.Client/Ats/Scorecards/Types/ScorecardsRetrieveRequestExpand.cs
index ed45ad7c..d7e5eab9 100644
--- a/src/Merge.Client/Ats/Scorecards/Types/ScorecardsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ats/Scorecards/Types/ScorecardsRetrieveRequestExpand.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/SyncStatus/Requests/SyncStatusListRequest.cs b/src/Merge.Client/Ats/SyncStatus/Requests/SyncStatusListRequest.cs
index 521164fc..eef5e563 100644
--- a/src/Merge.Client/Ats/SyncStatus/Requests/SyncStatusListRequest.cs
+++ b/src/Merge.Client/Ats/SyncStatus/Requests/SyncStatusListRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Ats;
 
-public class SyncStatusListRequest
+public record SyncStatusListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Ats/SyncStatus/SyncStatusClient.cs b/src/Merge.Client/Ats/SyncStatus/SyncStatusClient.cs
index 0e5d0292..7558cbdb 100644
--- a/src/Merge.Client/Ats/SyncStatus/SyncStatusClient.cs
+++ b/src/Merge.Client/Ats/SyncStatus/SyncStatusClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public SyncStatusClient(RawClient client)
     /// <summary>
     /// Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `PARTIALLY_SYNCED`, `PAUSED`, `SYNCING`. Learn more about sync status in our [Help Center](https://help.merge.dev/en/articles/8184193-merge-sync-statuses).
     /// </summary>
-    public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest request)
+    public async Task<PaginatedSyncStatusList> ListAsync(
+        SyncStatusListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -32,16 +35,30 @@ public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest reque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/sync-status",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedSyncStatusList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedSyncStatusList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Tags/Requests/TagsListRequest.cs b/src/Merge.Client/Ats/Tags/Requests/TagsListRequest.cs
index aa6f9e0f..686bc590 100644
--- a/src/Merge.Client/Ats/Tags/Requests/TagsListRequest.cs
+++ b/src/Merge.Client/Ats/Tags/Requests/TagsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ats;
 
-public class TagsListRequest
+public record TagsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Tags/TagsClient.cs b/src/Merge.Client/Ats/Tags/TagsClient.cs
index 092074d3..62dfc332 100644
--- a/src/Merge.Client/Ats/Tags/TagsClient.cs
+++ b/src/Merge.Client/Ats/Tags/TagsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public TagsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Tag` objects.
     /// </summary>
-    public async Task<PaginatedTagList> ListAsync(TagsListRequest request)
+    public async Task<PaginatedTagList> ListAsync(
+        TagsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedTagList> ListAsync(TagsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,16 +69,30 @@ public async Task<PaginatedTagList> ListAsync(TagsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/tags",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTagList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTagList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/Types/AccessRoleEnum.cs b/src/Merge.Client/Ats/Types/AccessRoleEnum.cs
index 7afb0786..026170b9 100644
--- a/src/Merge.Client/Ats/Types/AccessRoleEnum.cs
+++ b/src/Merge.Client/Ats/Types/AccessRoleEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/AccountDetails.cs b/src/Merge.Client/Ats/Types/AccountDetails.cs
index 6e2517bc..7416811d 100644
--- a/src/Merge.Client/Ats/Types/AccountDetails.cs
+++ b/src/Merge.Client/Ats/Types/AccountDetails.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AccountDetails
+public record AccountDetails
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     [JsonPropertyName("integration_slug")]
-    public string? IntegrationSlug { get; init; }
+    public string? IntegrationSlug { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     [JsonPropertyName("status")]
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string? WebhookListenerUrl { get; init; }
+    public string? WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string? AccountType { get; init; }
+    public string? AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AccountDetailsAndActions.cs b/src/Merge.Client/Ats/Types/AccountDetailsAndActions.cs
index 30242460..036be1d1 100644
--- a/src/Merge.Client/Ats/Types/AccountDetailsAndActions.cs
+++ b/src/Merge.Client/Ats/Types/AccountDetailsAndActions.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AccountDetailsAndActions
+public record AccountDetailsAndActions
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("status")]
-    public AccountDetailsAndActionsStatusEnum Status { get; init; }
+    public required AccountDetailsAndActionsStatusEnum Status { get; set; }
 
     [JsonPropertyName("status_detail")]
-    public string? StatusDetail { get; init; }
+    public string? StatusDetail { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// The tenant or domain the customer has provided access to.
     /// </summary>
     [JsonPropertyName("subdomain")]
-    public string? Subdomain { get; init; }
+    public string? Subdomain { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string WebhookListenerUrl { get; init; }
+    public required string WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountDetailsAndActionsIntegration? Integration { get; init; }
+    public AccountDetailsAndActionsIntegration? Integration { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string AccountType { get; init; }
+    public required string AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AccountDetailsAndActionsIntegration.cs b/src/Merge.Client/Ats/Types/AccountDetailsAndActionsIntegration.cs
index d2ccc6f0..97d4b553 100644
--- a/src/Merge.Client/Ats/Types/AccountDetailsAndActionsIntegration.cs
+++ b/src/Merge.Client/Ats/Types/AccountDetailsAndActionsIntegration.cs
@@ -1,33 +1,32 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AccountDetailsAndActionsIntegration
+public record AccountDetailsAndActionsIntegration
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     [JsonPropertyName("color")]
-    public string Color { get; init; }
+    public required string Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string Slug { get; init; }
+    public required string Slug { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AccountDetailsAndActionsStatusEnum.cs b/src/Merge.Client/Ats/Types/AccountDetailsAndActionsStatusEnum.cs
index 513068aa..3de37c61 100644
--- a/src/Merge.Client/Ats/Types/AccountDetailsAndActionsStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/AccountDetailsAndActionsStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/AccountIntegration.cs b/src/Merge.Client/Ats/Types/AccountIntegration.cs
index 1b5e0cf1..d9a02f28 100644
--- a/src/Merge.Client/Ats/Types/AccountIntegration.cs
+++ b/src/Merge.Client/Ats/Types/AccountIntegration.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AccountIntegration
+public record AccountIntegration
 {
     /// <summary>
     /// Company name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// Optional. This shortened name appears in places with limited space, usually in conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example: <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP SuccessFactors)</i>
     /// </summary>
     [JsonPropertyName("abbreviated_name")]
-    public string? AbbreviatedName { get; init; }
+    public string? AbbreviatedName { get; set; }
 
     /// <summary>
     /// Category or categories this integration belongs to. Multiple categories should be comma separated, i.e. [ats, hris].
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum>? Categories { get; init; }
+    public IEnumerable<CategoriesEnum>? Categories { get; set; }
 
     /// <summary>
     /// Company logo in rectangular shape. <b>Upload an image with a clear background.</b>
     /// </summary>
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     /// <summary>
     /// Company logo in square shape. <b>Upload an image with a white background.</b>
     /// </summary>
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     /// <summary>
     /// The color of this integration used for buttons and text throughout the app and landing pages. <b>Choose a darker, saturated color.</b>
     /// </summary>
     [JsonPropertyName("color")]
-    public string? Color { get; init; }
+    public string? Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string? Slug { get; init; }
+    public string? Slug { get; set; }
 
     /// <summary>
     /// Mapping of API endpoints to documentation urls for support. Example: {'GET': [['/common-model-scopes', 'https://docs.merge.dev/accounting/common-model-scopes/#common_model_scopes_retrieve'],['/common-model-actions', 'https://docs.merge.dev/accounting/common-model-actions/#common_model_actions_retrieve']], 'POST': []}
     /// </summary>
     [JsonPropertyName("api_endpoints_to_documentation_urls")]
-    public Dictionary<string, object>? ApiEndpointsToDocumentationUrls { get; init; }
+    public Dictionary<string, object?>? ApiEndpointsToDocumentationUrls { get; set; }
 
     /// <summary>
     /// Setup guide URL for third party webhook creation. Exposed in Merge Docs.
     /// </summary>
     [JsonPropertyName("webhook_setup_guide_url")]
-    public string? WebhookSetupGuideUrl { get; init; }
+    public string? WebhookSetupGuideUrl { get; set; }
 
     /// <summary>
     /// Category or categories this integration is in beta status for.
     /// </summary>
     [JsonPropertyName("category_beta_status")]
-    public Dictionary<string, object>? CategoryBetaStatus { get; init; }
+    public Dictionary<string, object?>? CategoryBetaStatus { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AccountToken.cs b/src/Merge.Client/Ats/Types/AccountToken.cs
index b09446a9..5a61f1a9 100644
--- a/src/Merge.Client/Ats/Types/AccountToken.cs
+++ b/src/Merge.Client/Ats/Types/AccountToken.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AccountToken
+public record AccountToken
 {
     [JsonPropertyName("account_token")]
-    public string AccountToken_ { get; init; }
+    public required string AccountToken_ { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/Activity.cs b/src/Merge.Client/Ats/Types/Activity.cs
index a5124142..8ddee898 100644
--- a/src/Merge.Client/Ats/Types/Activity.cs
+++ b/src/Merge.Client/Ats/Types/Activity.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,41 +6,41 @@
 
 namespace Merge.Client.Ats;
 
-public class Activity
+public record Activity
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The user that performed the action.
     /// </summary>
     [JsonPropertyName("user")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteUser>>))]
-    public OneOf<string, RemoteUser>? User { get; init; }
+    public OneOf<string, RemoteUser>? User { get; set; }
 
     /// <summary>
     /// When the third party's activity was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// The activity's type.
@@ -51,19 +50,19 @@ public class Activity
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("activity_type")]
-    public ActivityTypeEnum? ActivityType { get; init; }
+    public ActivityTypeEnum? ActivityType { get; set; }
 
     /// <summary>
     /// The activity's subject.
     /// </summary>
     [JsonPropertyName("subject")]
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
 
     /// <summary>
     /// The activity's body.
     /// </summary>
     [JsonPropertyName("body")]
-    public string? Body { get; init; }
+    public string? Body { get; set; }
 
     /// <summary>
     /// The activity's visibility.
@@ -73,20 +72,20 @@ public class Activity
     /// - `PRIVATE` - PRIVATE
     /// </summary>
     [JsonPropertyName("visibility")]
-    public VisibilityEnum? Visibility { get; init; }
+    public VisibilityEnum? Visibility { get; set; }
 
     [JsonPropertyName("candidate")]
-    public string? Candidate { get; init; }
+    public string? Candidate { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ActivityRequest.cs b/src/Merge.Client/Ats/Types/ActivityRequest.cs
index 37d8f9f0..9d115a60 100644
--- a/src/Merge.Client/Ats/Types/ActivityRequest.cs
+++ b/src/Merge.Client/Ats/Types/ActivityRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,14 +6,14 @@
 
 namespace Merge.Client.Ats;
 
-public class ActivityRequest
+public record ActivityRequest
 {
     /// <summary>
     /// The user that performed the action.
     /// </summary>
     [JsonPropertyName("user")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteUser>>))]
-    public OneOf<string, RemoteUser>? User { get; init; }
+    public OneOf<string, RemoteUser>? User { get; set; }
 
     /// <summary>
     /// The activity's type.
@@ -24,19 +23,19 @@ public class ActivityRequest
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("activity_type")]
-    public ActivityTypeEnum? ActivityType { get; init; }
+    public ActivityTypeEnum? ActivityType { get; set; }
 
     /// <summary>
     /// The activity's subject.
     /// </summary>
     [JsonPropertyName("subject")]
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
 
     /// <summary>
     /// The activity's body.
     /// </summary>
     [JsonPropertyName("body")]
-    public string? Body { get; init; }
+    public string? Body { get; set; }
 
     /// <summary>
     /// The activity's visibility.
@@ -46,14 +45,14 @@ public class ActivityRequest
     /// - `PRIVATE` - PRIVATE
     /// </summary>
     [JsonPropertyName("visibility")]
-    public VisibilityEnum? Visibility { get; init; }
+    public VisibilityEnum? Visibility { get; set; }
 
     [JsonPropertyName("candidate")]
-    public string? Candidate { get; init; }
+    public string? Candidate { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ActivityResponse.cs b/src/Merge.Client/Ats/Types/ActivityResponse.cs
index 55cc8485..c750c354 100644
--- a/src/Merge.Client/Ats/Types/ActivityResponse.cs
+++ b/src/Merge.Client/Ats/Types/ActivityResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class ActivityResponse
+public record ActivityResponse
 {
     [JsonPropertyName("model")]
-    public Activity Model { get; init; }
+    public required Activity Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ActivityTypeEnum.cs b/src/Merge.Client/Ats/Types/ActivityTypeEnum.cs
index fc5d2c88..5b0cfe23 100644
--- a/src/Merge.Client/Ats/Types/ActivityTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/ActivityTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/AdvancedMetadata.cs b/src/Merge.Client/Ats/Types/AdvancedMetadata.cs
index fbcbc864..4643717c 100644
--- a/src/Merge.Client/Ats/Types/AdvancedMetadata.cs
+++ b/src/Merge.Client/Ats/Types/AdvancedMetadata.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Ats;
 
-public class AdvancedMetadata
+public record AdvancedMetadata
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("is_custom")]
-    public bool? IsCustom { get; init; }
+    public bool? IsCustom { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<object>? FieldChoices { get; init; }
+    public IEnumerable<object>? FieldChoices { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/Application.cs b/src/Merge.Client/Ats/Types/Application.cs
index da9122be..706f0b41 100644
--- a/src/Merge.Client/Ats/Types/Application.cs
+++ b/src/Merge.Client/Ats/Types/Application.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,54 +6,54 @@
 
 namespace Merge.Client.Ats;
 
-public class Application
+public record Application
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The candidate applying.
     /// </summary>
     [JsonPropertyName("candidate")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Candidate>>))]
-    public OneOf<string, Candidate>? Candidate { get; init; }
+    public OneOf<string, Candidate>? Candidate { get; set; }
 
     /// <summary>
     /// The job being applied for.
     /// </summary>
     [JsonPropertyName("job")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Job>>))]
-    public OneOf<string, Job>? Job { get; init; }
+    public OneOf<string, Job>? Job { get; set; }
 
     /// <summary>
     /// When the application was submitted.
     /// </summary>
     [JsonPropertyName("applied_at")]
-    public DateTime? AppliedAt { get; init; }
+    public DateTime? AppliedAt { get; set; }
 
     /// <summary>
     /// When the application was rejected.
     /// </summary>
     [JsonPropertyName("rejected_at")]
-    public DateTime? RejectedAt { get; init; }
+    public DateTime? RejectedAt { get; set; }
 
     [JsonPropertyName("offers")]
     [JsonConverter(
@@ -63,20 +62,20 @@ public class Application
             OneOfSerializer<OneOf<string, Offer>>
         >)
     )]
-    public IEnumerable<OneOf<string, Offer>>? Offers { get; init; }
+    public IEnumerable<OneOf<string, Offer>>? Offers { get; set; }
 
     /// <summary>
     /// The application's source.
     /// </summary>
     [JsonPropertyName("source")]
-    public string? Source { get; init; }
+    public string? Source { get; set; }
 
     /// <summary>
     /// The user credited for this application.
     /// </summary>
     [JsonPropertyName("credited_to")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteUser>>))]
-    public OneOf<string, RemoteUser>? CreditedTo { get; init; }
+    public OneOf<string, RemoteUser>? CreditedTo { get; set; }
 
     [JsonPropertyName("screening_question_answers")]
     [JsonConverter(
@@ -87,28 +86,28 @@ public class Application
     )]
     public IEnumerable<
         OneOf<string, ScreeningQuestionAnswer>
-    >? ScreeningQuestionAnswers { get; init; }
+    >? ScreeningQuestionAnswers { get; set; }
 
     /// <summary>
     /// The application's current stage.
     /// </summary>
     [JsonPropertyName("current_stage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, JobInterviewStage>>))]
-    public OneOf<string, JobInterviewStage>? CurrentStage { get; init; }
+    public OneOf<string, JobInterviewStage>? CurrentStage { get; set; }
 
     /// <summary>
     /// The application's reason for rejection.
     /// </summary>
     [JsonPropertyName("reject_reason")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RejectReason>>))]
-    public OneOf<string, RejectReason>? RejectReason { get; init; }
+    public OneOf<string, RejectReason>? RejectReason { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ApplicationRequest.cs b/src/Merge.Client/Ats/Types/ApplicationRequest.cs
index 97411a8d..397555bb 100644
--- a/src/Merge.Client/Ats/Types/ApplicationRequest.cs
+++ b/src/Merge.Client/Ats/Types/ApplicationRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,33 +6,33 @@
 
 namespace Merge.Client.Ats;
 
-public class ApplicationRequest
+public record ApplicationRequest
 {
     /// <summary>
     /// The candidate applying.
     /// </summary>
     [JsonPropertyName("candidate")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Candidate>>))]
-    public OneOf<string, Candidate>? Candidate { get; init; }
+    public OneOf<string, Candidate>? Candidate { get; set; }
 
     /// <summary>
     /// The job being applied for.
     /// </summary>
     [JsonPropertyName("job")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Job>>))]
-    public OneOf<string, Job>? Job { get; init; }
+    public OneOf<string, Job>? Job { get; set; }
 
     /// <summary>
     /// When the application was submitted.
     /// </summary>
     [JsonPropertyName("applied_at")]
-    public DateTime? AppliedAt { get; init; }
+    public DateTime? AppliedAt { get; set; }
 
     /// <summary>
     /// When the application was rejected.
     /// </summary>
     [JsonPropertyName("rejected_at")]
-    public DateTime? RejectedAt { get; init; }
+    public DateTime? RejectedAt { get; set; }
 
     [JsonPropertyName("offers")]
     [JsonConverter(
@@ -42,20 +41,20 @@ public class ApplicationRequest
             OneOfSerializer<OneOf<string, Offer>>
         >)
     )]
-    public IEnumerable<OneOf<string, Offer>>? Offers { get; init; }
+    public IEnumerable<OneOf<string, Offer>>? Offers { get; set; }
 
     /// <summary>
     /// The application's source.
     /// </summary>
     [JsonPropertyName("source")]
-    public string? Source { get; init; }
+    public string? Source { get; set; }
 
     /// <summary>
     /// The user credited for this application.
     /// </summary>
     [JsonPropertyName("credited_to")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteUser>>))]
-    public OneOf<string, RemoteUser>? CreditedTo { get; init; }
+    public OneOf<string, RemoteUser>? CreditedTo { get; set; }
 
     [JsonPropertyName("screening_question_answers")]
     [JsonConverter(
@@ -66,28 +65,28 @@ public class ApplicationRequest
     )]
     public IEnumerable<
         OneOf<string, ScreeningQuestionAnswerRequest>
-    >? ScreeningQuestionAnswers { get; init; }
+    >? ScreeningQuestionAnswers { get; set; }
 
     /// <summary>
     /// The application's current stage.
     /// </summary>
     [JsonPropertyName("current_stage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, JobInterviewStage>>))]
-    public OneOf<string, JobInterviewStage>? CurrentStage { get; init; }
+    public OneOf<string, JobInterviewStage>? CurrentStage { get; set; }
 
     /// <summary>
     /// The application's reason for rejection.
     /// </summary>
     [JsonPropertyName("reject_reason")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RejectReason>>))]
-    public OneOf<string, RejectReason>? RejectReason { get; init; }
+    public OneOf<string, RejectReason>? RejectReason { get; set; }
 
     [JsonPropertyName("remote_template_id")]
-    public string? RemoteTemplateId { get; init; }
+    public string? RemoteTemplateId { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ApplicationResponse.cs b/src/Merge.Client/Ats/Types/ApplicationResponse.cs
index a419cb18..d012c010 100644
--- a/src/Merge.Client/Ats/Types/ApplicationResponse.cs
+++ b/src/Merge.Client/Ats/Types/ApplicationResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class ApplicationResponse
+public record ApplicationResponse
 {
     [JsonPropertyName("model")]
-    public Application Model { get; init; }
+    public required Application Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AsyncPassthroughReciept.cs b/src/Merge.Client/Ats/Types/AsyncPassthroughReciept.cs
index 72c6b88f..4da3cc6c 100644
--- a/src/Merge.Client/Ats/Types/AsyncPassthroughReciept.cs
+++ b/src/Merge.Client/Ats/Types/AsyncPassthroughReciept.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Ats;
 
-public class AsyncPassthroughReciept
+public record AsyncPassthroughReciept
 {
     [JsonPropertyName("async_passthrough_receipt_id")]
-    public string AsyncPassthroughReceiptId { get; init; }
+    public required string AsyncPassthroughReceiptId { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/Attachment.cs b/src/Merge.Client/Ats/Types/Attachment.cs
index 68689bbd..5563c733 100644
--- a/src/Merge.Client/Ats/Types/Attachment.cs
+++ b/src/Merge.Client/Ats/Types/Attachment.cs
@@ -1,50 +1,49 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class Attachment
+public record Attachment
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The attachment's name.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The attachment's url.
     /// </summary>
     [JsonPropertyName("file_url")]
-    public string? FileUrl { get; init; }
+    public string? FileUrl { get; set; }
 
     /// <summary>
     ///
     /// </summary>
     [JsonPropertyName("candidate")]
-    public string? Candidate { get; init; }
+    public string? Candidate { get; set; }
 
     /// <summary>
     /// The attachment's type.
@@ -55,14 +54,14 @@ public class Attachment
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("attachment_type")]
-    public AttachmentTypeEnum? AttachmentType { get; init; }
+    public AttachmentTypeEnum? AttachmentType { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AttachmentRequest.cs b/src/Merge.Client/Ats/Types/AttachmentRequest.cs
index 5773cda9..320ad4d4 100644
--- a/src/Merge.Client/Ats/Types/AttachmentRequest.cs
+++ b/src/Merge.Client/Ats/Types/AttachmentRequest.cs
@@ -1,29 +1,28 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AttachmentRequest
+public record AttachmentRequest
 {
     /// <summary>
     /// The attachment's name.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The attachment's url.
     /// </summary>
     [JsonPropertyName("file_url")]
-    public string? FileUrl { get; init; }
+    public string? FileUrl { get; set; }
 
     /// <summary>
     ///
     /// </summary>
     [JsonPropertyName("candidate")]
-    public string? Candidate { get; init; }
+    public string? Candidate { get; set; }
 
     /// <summary>
     /// The attachment's type.
@@ -34,11 +33,11 @@ public class AttachmentRequest
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("attachment_type")]
-    public AttachmentTypeEnum? AttachmentType { get; init; }
+    public AttachmentTypeEnum? AttachmentType { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AttachmentResponse.cs b/src/Merge.Client/Ats/Types/AttachmentResponse.cs
index 9287da25..f859694b 100644
--- a/src/Merge.Client/Ats/Types/AttachmentResponse.cs
+++ b/src/Merge.Client/Ats/Types/AttachmentResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AttachmentResponse
+public record AttachmentResponse
 {
     [JsonPropertyName("model")]
-    public Attachment Model { get; init; }
+    public required Attachment Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AttachmentTypeEnum.cs b/src/Merge.Client/Ats/Types/AttachmentTypeEnum.cs
index 422c1a17..8318ee80 100644
--- a/src/Merge.Client/Ats/Types/AttachmentTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/AttachmentTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/AuditLogEvent.cs b/src/Merge.Client/Ats/Types/AuditLogEvent.cs
index 22c55d38..92e0d220 100644
--- a/src/Merge.Client/Ats/Types/AuditLogEvent.cs
+++ b/src/Merge.Client/Ats/Types/AuditLogEvent.cs
@@ -1,26 +1,25 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AuditLogEvent
+public record AuditLogEvent
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The User's full name at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_name")]
-    public string? UserName { get; init; }
+    public string? UserName { get; set; }
 
     /// <summary>
     /// The User's email at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_email")]
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 
     /// <summary>
     /// Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.
@@ -33,10 +32,10 @@ public class AuditLogEvent
     /// - `MERGE_TEAM` - MERGE_TEAM
     /// </summary>
     [JsonPropertyName("role")]
-    public RoleEnum Role { get; init; }
+    public required RoleEnum Role { get; set; }
 
     [JsonPropertyName("ip_address")]
-    public string IpAddress { get; init; }
+    public required string IpAddress { get; set; }
 
     /// <summary>
     /// Designates the type of event that occurred.
@@ -81,11 +80,11 @@ public class AuditLogEvent
     /// - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
     /// </summary>
     [JsonPropertyName("event_type")]
-    public EventTypeEnum EventType { get; init; }
+    public required EventTypeEnum EventType { get; set; }
 
     [JsonPropertyName("event_description")]
-    public string EventDescription { get; init; }
+    public required string EventDescription { get; set; }
 
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/AvailableActions.cs b/src/Merge.Client/Ats/Types/AvailableActions.cs
index 91c1d3c3..6c9dba4a 100644
--- a/src/Merge.Client/Ats/Types/AvailableActions.cs
+++ b/src/Merge.Client/Ats/Types/AvailableActions.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class AvailableActions
+public record AvailableActions
 {
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/Candidate.cs b/src/Merge.Client/Ats/Types/Candidate.cs
index 4ce723d4..5f0ad7ad 100644
--- a/src/Merge.Client/Ats/Types/Candidate.cs
+++ b/src/Merge.Client/Ats/Types/Candidate.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,103 +6,103 @@
 
 namespace Merge.Client.Ats;
 
-public class Candidate
+public record Candidate
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The candidate's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The candidate's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The candidate's current company.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// The candidate's current title.
     /// </summary>
     [JsonPropertyName("title")]
-    public string? Title { get; init; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// When the third party's candidate was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's candidate was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// When the most recent interaction with the candidate occurred.
     /// </summary>
     [JsonPropertyName("last_interaction_at")]
-    public DateTime? LastInteractionAt { get; init; }
+    public DateTime? LastInteractionAt { get; set; }
 
     /// <summary>
     /// Whether or not the candidate is private.
     /// </summary>
     [JsonPropertyName("is_private")]
-    public bool? IsPrivate { get; init; }
+    public bool? IsPrivate { get; set; }
 
     /// <summary>
     /// Whether or not the candidate can be emailed.
     /// </summary>
     [JsonPropertyName("can_email")]
-    public bool? CanEmail { get; init; }
+    public bool? CanEmail { get; set; }
 
     /// <summary>
     /// The candidate's locations.
     /// </summary>
     [JsonPropertyName("locations")]
-    public IEnumerable<string>? Locations { get; init; }
+    public IEnumerable<string>? Locations { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumber>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumber>? PhoneNumbers { get; set; }
 
     [JsonPropertyName("email_addresses")]
-    public IEnumerable<EmailAddress>? EmailAddresses { get; init; }
+    public IEnumerable<EmailAddress>? EmailAddresses { get; set; }
 
     [JsonPropertyName("urls")]
-    public IEnumerable<Url>? Urls { get; init; }
+    public IEnumerable<Url>? Urls { get; set; }
 
     /// <summary>
     /// Array of `Tag` names as strings.
     /// </summary>
     [JsonPropertyName("tags")]
-    public IEnumerable<string>? Tags { get; init; }
+    public IEnumerable<string>? Tags { get; set; }
 
     /// <summary>
     /// Array of `Application` object IDs.
@@ -115,7 +114,7 @@ public class Candidate
             OneOfSerializer<OneOf<string, Application>>
         >)
     )]
-    public IEnumerable<OneOf<string, Application>>? Applications { get; init; }
+    public IEnumerable<OneOf<string, Application>>? Applications { get; set; }
 
     /// <summary>
     /// Array of `Attachment` object IDs.
@@ -127,14 +126,14 @@ public class Candidate
             OneOfSerializer<OneOf<string, Attachment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Attachment>>? Attachments { get; init; }
+    public IEnumerable<OneOf<string, Attachment>>? Attachments { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/CandidateRequest.cs b/src/Merge.Client/Ats/Types/CandidateRequest.cs
index b7b13254..4a461608 100644
--- a/src/Merge.Client/Ats/Types/CandidateRequest.cs
+++ b/src/Merge.Client/Ats/Types/CandidateRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,70 +6,70 @@
 
 namespace Merge.Client.Ats;
 
-public class CandidateRequest
+public record CandidateRequest
 {
     /// <summary>
     /// The candidate's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The candidate's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The candidate's current company.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// The candidate's current title.
     /// </summary>
     [JsonPropertyName("title")]
-    public string? Title { get; init; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// When the most recent interaction with the candidate occurred.
     /// </summary>
     [JsonPropertyName("last_interaction_at")]
-    public DateTime? LastInteractionAt { get; init; }
+    public DateTime? LastInteractionAt { get; set; }
 
     /// <summary>
     /// Whether or not the candidate is private.
     /// </summary>
     [JsonPropertyName("is_private")]
-    public bool? IsPrivate { get; init; }
+    public bool? IsPrivate { get; set; }
 
     /// <summary>
     /// Whether or not the candidate can be emailed.
     /// </summary>
     [JsonPropertyName("can_email")]
-    public bool? CanEmail { get; init; }
+    public bool? CanEmail { get; set; }
 
     /// <summary>
     /// The candidate's locations.
     /// </summary>
     [JsonPropertyName("locations")]
-    public IEnumerable<string>? Locations { get; init; }
+    public IEnumerable<string>? Locations { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; set; }
 
     [JsonPropertyName("email_addresses")]
-    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; init; }
+    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; set; }
 
     [JsonPropertyName("urls")]
-    public IEnumerable<UrlRequest>? Urls { get; init; }
+    public IEnumerable<UrlRequest>? Urls { get; set; }
 
     /// <summary>
     /// Array of `Tag` names as strings.
     /// </summary>
     [JsonPropertyName("tags")]
-    public IEnumerable<string>? Tags { get; init; }
+    public IEnumerable<string>? Tags { get; set; }
 
     /// <summary>
     /// Array of `Application` object IDs.
@@ -82,7 +81,7 @@ public class CandidateRequest
             OneOfSerializer<OneOf<string, Application>>
         >)
     )]
-    public IEnumerable<OneOf<string, Application>>? Applications { get; init; }
+    public IEnumerable<OneOf<string, Application>>? Applications { get; set; }
 
     /// <summary>
     /// Array of `Attachment` object IDs.
@@ -94,14 +93,14 @@ public class CandidateRequest
             OneOfSerializer<OneOf<string, Attachment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Attachment>>? Attachments { get; init; }
+    public IEnumerable<OneOf<string, Attachment>>? Attachments { get; set; }
 
     [JsonPropertyName("remote_template_id")]
-    public string? RemoteTemplateId { get; init; }
+    public string? RemoteTemplateId { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/CandidateResponse.cs b/src/Merge.Client/Ats/Types/CandidateResponse.cs
index 229f009b..0a7d082b 100644
--- a/src/Merge.Client/Ats/Types/CandidateResponse.cs
+++ b/src/Merge.Client/Ats/Types/CandidateResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class CandidateResponse
+public record CandidateResponse
 {
     [JsonPropertyName("model")]
-    public Candidate Model { get; init; }
+    public required Candidate Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/CategoriesEnum.cs b/src/Merge.Client/Ats/Types/CategoriesEnum.cs
index bdd0c61a..e856a19f 100644
--- a/src/Merge.Client/Ats/Types/CategoriesEnum.cs
+++ b/src/Merge.Client/Ats/Types/CategoriesEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/CategoryEnum.cs b/src/Merge.Client/Ats/Types/CategoryEnum.cs
index 87ad021b..a6c8b93d 100644
--- a/src/Merge.Client/Ats/Types/CategoryEnum.cs
+++ b/src/Merge.Client/Ats/Types/CategoryEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/CommonModelScopeApi.cs b/src/Merge.Client/Ats/Types/CommonModelScopeApi.cs
index 4d40385f..55b8bcec 100644
--- a/src/Merge.Client/Ats/Types/CommonModelScopeApi.cs
+++ b/src/Merge.Client/Ats/Types/CommonModelScopeApi.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class CommonModelScopeApi
+public record CommonModelScopeApi
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializer>();
 }
diff --git a/src/Merge.Client/Ats/Types/CommonModelScopesBodyRequest.cs b/src/Merge.Client/Ats/Types/CommonModelScopesBodyRequest.cs
index f2fe8021..49445172 100644
--- a/src/Merge.Client/Ats/Types/CommonModelScopesBodyRequest.cs
+++ b/src/Merge.Client/Ats/Types/CommonModelScopesBodyRequest.cs
@@ -1,18 +1,18 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class CommonModelScopesBodyRequest
+public record CommonModelScopesBodyRequest
 {
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("enabled_actions")]
-    public IEnumerable<EnabledActionsEnum> EnabledActions { get; init; }
+    public IEnumerable<EnabledActionsEnum> EnabledActions { get; set; } =
+        new List<EnabledActionsEnum>();
 
     [JsonPropertyName("disabled_fields")]
-    public IEnumerable<string> DisabledFields { get; init; }
+    public IEnumerable<string> DisabledFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Ats/Types/DataPassthroughRequest.cs b/src/Merge.Client/Ats/Types/DataPassthroughRequest.cs
index a424cb29..cead9ff0 100644
--- a/src/Merge.Client/Ats/Types/DataPassthroughRequest.cs
+++ b/src/Merge.Client/Ats/Types/DataPassthroughRequest.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class DataPassthroughRequest
+public record DataPassthroughRequest
 {
     [JsonPropertyName("method")]
-    public MethodEnum Method { get; init; }
+    public required MethodEnum Method { get; set; }
 
     /// <summary>
     /// The path of the request in the third party's platform.
     /// </summary>
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     /// <summary>
     /// An optional override of the third party's base url for the request.
     /// </summary>
     [JsonPropertyName("base_url_override")]
-    public string? BaseUrlOverride { get; init; }
+    public string? BaseUrlOverride { get; set; }
 
     /// <summary>
     /// The data with the request. You must include a `request_format` parameter matching the data's format
     /// </summary>
     [JsonPropertyName("data")]
-    public string? Data { get; init; }
+    public string? Data { get; set; }
 
     /// <summary>
     /// Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`.
     /// </summary>
     [JsonPropertyName("multipart_form_data")]
-    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; init; }
+    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; set; }
 
     /// <summary>
     /// The headers to use for the request (Merge will handle the account's authorization headers). `Content-Type` header is required for passthrough. Choose content type corresponding to expected format of receiving server.
     /// </summary>
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 
     [JsonPropertyName("request_format")]
-    public RequestFormatEnum? RequestFormat { get; init; }
+    public RequestFormatEnum? RequestFormat { get; set; }
 
     /// <summary>
     /// Optional. If true, the response will always be an object of the form `{"type": T, "value": ...}` where `T` will be one of `string, boolean, number, null, array, object`.
     /// </summary>
     [JsonPropertyName("normalize_response")]
-    public bool? NormalizeResponse { get; init; }
+    public bool? NormalizeResponse { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/DebugModeLog.cs b/src/Merge.Client/Ats/Types/DebugModeLog.cs
index cde19ab4..52be84e7 100644
--- a/src/Merge.Client/Ats/Types/DebugModeLog.cs
+++ b/src/Merge.Client/Ats/Types/DebugModeLog.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class DebugModeLog
+public record DebugModeLog
 {
     [JsonPropertyName("log_id")]
-    public string LogId { get; init; }
+    public required string LogId { get; set; }
 
     [JsonPropertyName("dashboard_view")]
-    public string DashboardView { get; init; }
+    public required string DashboardView { get; set; }
 
     [JsonPropertyName("log_summary")]
-    public DebugModelLogSummary LogSummary { get; init; }
+    public required DebugModelLogSummary LogSummary { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/DebugModelLogSummary.cs b/src/Merge.Client/Ats/Types/DebugModelLogSummary.cs
index c22e7d37..517fd6ad 100644
--- a/src/Merge.Client/Ats/Types/DebugModelLogSummary.cs
+++ b/src/Merge.Client/Ats/Types/DebugModelLogSummary.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ats;
 
-public class DebugModelLogSummary
+public record DebugModelLogSummary
 {
     [JsonPropertyName("url")]
-    public string Url { get; init; }
+    public required string Url { get; set; }
 
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("status_code")]
-    public int StatusCode { get; init; }
+    public required int StatusCode { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/Department.cs b/src/Merge.Client/Ats/Types/Department.cs
index 2e388b59..79530bd0 100644
--- a/src/Merge.Client/Ats/Types/Department.cs
+++ b/src/Merge.Client/Ats/Types/Department.cs
@@ -1,48 +1,47 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class Department
+public record Department
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The department's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/DisabilityStatusEnum.cs b/src/Merge.Client/Ats/Types/DisabilityStatusEnum.cs
index 2d747dac..8a61d573 100644
--- a/src/Merge.Client/Ats/Types/DisabilityStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/DisabilityStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/Eeoc.cs b/src/Merge.Client/Ats/Types/Eeoc.cs
index 0b3922f5..13912ca9 100644
--- a/src/Merge.Client/Ats/Types/Eeoc.cs
+++ b/src/Merge.Client/Ats/Types/Eeoc.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,41 +6,41 @@
 
 namespace Merge.Client.Ats;
 
-public class Eeoc
+public record Eeoc
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The candidate being represented.
     /// </summary>
     [JsonPropertyName("candidate")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Candidate>>))]
-    public OneOf<string, Candidate>? Candidate { get; init; }
+    public OneOf<string, Candidate>? Candidate { get; set; }
 
     /// <summary>
     /// When the information was submitted.
     /// </summary>
     [JsonPropertyName("submitted_at")]
-    public DateTime? SubmittedAt { get; init; }
+    public DateTime? SubmittedAt { get; set; }
 
     /// <summary>
     /// The candidate's race.
@@ -56,7 +55,7 @@ public class Eeoc
     /// - `DECLINE_TO_SELF_IDENTIFY` - DECLINE_TO_SELF_IDENTIFY
     /// </summary>
     [JsonPropertyName("race")]
-    public RaceEnum? Race { get; init; }
+    public RaceEnum? Race { get; set; }
 
     /// <summary>
     /// The candidate's gender.
@@ -68,7 +67,7 @@ public class Eeoc
     /// - `DECLINE_TO_SELF_IDENTIFY` - DECLINE_TO_SELF_IDENTIFY
     /// </summary>
     [JsonPropertyName("gender")]
-    public GenderEnum? Gender { get; init; }
+    public GenderEnum? Gender { get; set; }
 
     /// <summary>
     /// The candidate's veteran status.
@@ -78,7 +77,7 @@ public class Eeoc
     /// - `I_DONT_WISH_TO_ANSWER` - I_DONT_WISH_TO_ANSWER
     /// </summary>
     [JsonPropertyName("veteran_status")]
-    public VeteranStatusEnum? VeteranStatus { get; init; }
+    public VeteranStatusEnum? VeteranStatus { get; set; }
 
     /// <summary>
     /// The candidate's disability status.
@@ -88,17 +87,17 @@ public class Eeoc
     /// - `I_DONT_WISH_TO_ANSWER` - I_DONT_WISH_TO_ANSWER
     /// </summary>
     [JsonPropertyName("disability_status")]
-    public DisabilityStatusEnum? DisabilityStatus { get; init; }
+    public DisabilityStatusEnum? DisabilityStatus { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/EmailAddress.cs b/src/Merge.Client/Ats/Types/EmailAddress.cs
index 91c8f690..6a12130b 100644
--- a/src/Merge.Client/Ats/Types/EmailAddress.cs
+++ b/src/Merge.Client/Ats/Types/EmailAddress.cs
@@ -1,29 +1,28 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class EmailAddress
+public record EmailAddress
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The email address.
     /// </summary>
     [JsonPropertyName("value")]
-    public string? Value { get; init; }
+    public string? Value { get; set; }
 
     /// <summary>
     /// The type of email address.
@@ -33,11 +32,11 @@ public class EmailAddress
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("email_address_type")]
-    public EmailAddressTypeEnum? EmailAddressType { get; init; }
+    public EmailAddressTypeEnum? EmailAddressType { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/EmailAddressRequest.cs b/src/Merge.Client/Ats/Types/EmailAddressRequest.cs
index 3c1b9604..bb302bb1 100644
--- a/src/Merge.Client/Ats/Types/EmailAddressRequest.cs
+++ b/src/Merge.Client/Ats/Types/EmailAddressRequest.cs
@@ -1,17 +1,16 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class EmailAddressRequest
+public record EmailAddressRequest
 {
     /// <summary>
     /// The email address.
     /// </summary>
     [JsonPropertyName("value")]
-    public string? Value { get; init; }
+    public string? Value { get; set; }
 
     /// <summary>
     /// The type of email address.
@@ -21,11 +20,11 @@ public class EmailAddressRequest
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("email_address_type")]
-    public EmailAddressTypeEnum? EmailAddressType { get; init; }
+    public EmailAddressTypeEnum? EmailAddressType { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/EmailAddressTypeEnum.cs b/src/Merge.Client/Ats/Types/EmailAddressTypeEnum.cs
index 1ec38aa9..655e169e 100644
--- a/src/Merge.Client/Ats/Types/EmailAddressTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/EmailAddressTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/EnabledActionsEnum.cs b/src/Merge.Client/Ats/Types/EnabledActionsEnum.cs
index 90d52a85..b906d125 100644
--- a/src/Merge.Client/Ats/Types/EnabledActionsEnum.cs
+++ b/src/Merge.Client/Ats/Types/EnabledActionsEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/EncodingEnum.cs b/src/Merge.Client/Ats/Types/EncodingEnum.cs
index 6cff51c4..c44a0d37 100644
--- a/src/Merge.Client/Ats/Types/EncodingEnum.cs
+++ b/src/Merge.Client/Ats/Types/EncodingEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/ErrorValidationProblem.cs b/src/Merge.Client/Ats/Types/ErrorValidationProblem.cs
index 46a77049..357b8b5b 100644
--- a/src/Merge.Client/Ats/Types/ErrorValidationProblem.cs
+++ b/src/Merge.Client/Ats/Types/ErrorValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class ErrorValidationProblem
+public record ErrorValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/EventTypeEnum.cs b/src/Merge.Client/Ats/Types/EventTypeEnum.cs
index b3e73398..4cf6a887 100644
--- a/src/Merge.Client/Ats/Types/EventTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/EventTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/ExternalTargetFieldApi.cs b/src/Merge.Client/Ats/Types/ExternalTargetFieldApi.cs
index db3ae9fb..de1d27db 100644
--- a/src/Merge.Client/Ats/Types/ExternalTargetFieldApi.cs
+++ b/src/Merge.Client/Ats/Types/ExternalTargetFieldApi.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ats;
 
-public class ExternalTargetFieldApi
+public record ExternalTargetFieldApi
 {
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_mapped")]
-    public string? IsMapped { get; init; }
+    public string? IsMapped { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ExternalTargetFieldApiResponse.cs b/src/Merge.Client/Ats/Types/ExternalTargetFieldApiResponse.cs
index a06ed9f2..82a493b8 100644
--- a/src/Merge.Client/Ats/Types/ExternalTargetFieldApiResponse.cs
+++ b/src/Merge.Client/Ats/Types/ExternalTargetFieldApiResponse.cs
@@ -1,57 +1,56 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class ExternalTargetFieldApiResponse
+public record ExternalTargetFieldApiResponse
 {
     [JsonPropertyName("Activity")]
-    public IEnumerable<ExternalTargetFieldApi>? Activity { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Activity { get; set; }
 
     [JsonPropertyName("Application")]
-    public IEnumerable<ExternalTargetFieldApi>? Application { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Application { get; set; }
 
     [JsonPropertyName("Attachment")]
-    public IEnumerable<ExternalTargetFieldApi>? Attachment { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Attachment { get; set; }
 
     [JsonPropertyName("Candidate")]
-    public IEnumerable<ExternalTargetFieldApi>? Candidate { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Candidate { get; set; }
 
     [JsonPropertyName("Department")]
-    public IEnumerable<ExternalTargetFieldApi>? Department { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Department { get; set; }
 
     [JsonPropertyName("EEOC")]
-    public IEnumerable<ExternalTargetFieldApi>? Eeoc { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Eeoc { get; set; }
 
     [JsonPropertyName("ScheduledInterview")]
-    public IEnumerable<ExternalTargetFieldApi>? ScheduledInterview { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? ScheduledInterview { get; set; }
 
     [JsonPropertyName("Job")]
-    public IEnumerable<ExternalTargetFieldApi>? Job { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Job { get; set; }
 
     [JsonPropertyName("JobPosting")]
-    public IEnumerable<ExternalTargetFieldApi>? JobPosting { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? JobPosting { get; set; }
 
     [JsonPropertyName("JobInterviewStage")]
-    public IEnumerable<ExternalTargetFieldApi>? JobInterviewStage { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? JobInterviewStage { get; set; }
 
     [JsonPropertyName("Offer")]
-    public IEnumerable<ExternalTargetFieldApi>? Offer { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Offer { get; set; }
 
     [JsonPropertyName("Office")]
-    public IEnumerable<ExternalTargetFieldApi>? Office { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Office { get; set; }
 
     [JsonPropertyName("RejectReason")]
-    public IEnumerable<ExternalTargetFieldApi>? RejectReason { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? RejectReason { get; set; }
 
     [JsonPropertyName("Scorecard")]
-    public IEnumerable<ExternalTargetFieldApi>? Scorecard { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Scorecard { get; set; }
 
     [JsonPropertyName("Tag")]
-    public IEnumerable<ExternalTargetFieldApi>? Tag { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Tag { get; set; }
 
     [JsonPropertyName("RemoteUser")]
-    public IEnumerable<ExternalTargetFieldApi>? RemoteUser { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? RemoteUser { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/FieldMappingApiInstance.cs b/src/Merge.Client/Ats/Types/FieldMappingApiInstance.cs
index 5a5b6114..90116d30 100644
--- a/src/Merge.Client/Ats/Types/FieldMappingApiInstance.cs
+++ b/src/Merge.Client/Ats/Types/FieldMappingApiInstance.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class FieldMappingApiInstance
+public record FieldMappingApiInstance
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("is_integration_wide")]
-    public bool? IsIntegrationWide { get; init; }
+    public bool? IsIntegrationWide { get; set; }
 
     [JsonPropertyName("target_field")]
-    public FieldMappingApiInstanceTargetField? TargetField { get; init; }
+    public FieldMappingApiInstanceTargetField? TargetField { get; set; }
 
     [JsonPropertyName("remote_field")]
-    public FieldMappingApiInstanceRemoteField? RemoteField { get; init; }
+    public FieldMappingApiInstanceRemoteField? RemoteField { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/FieldMappingApiInstanceRemoteField.cs b/src/Merge.Client/Ats/Types/FieldMappingApiInstanceRemoteField.cs
index fc5e971c..575057f3 100644
--- a/src/Merge.Client/Ats/Types/FieldMappingApiInstanceRemoteField.cs
+++ b/src/Merge.Client/Ats/Types/FieldMappingApiInstanceRemoteField.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class FieldMappingApiInstanceRemoteField
+public record FieldMappingApiInstanceRemoteField
 {
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_endpoint_info")]
-    public FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs b/src/Merge.Client/Ats/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
index 0468ab2a..113436b8 100644
--- a/src/Merge.Client/Ats/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
+++ b/src/Merge.Client/Ats/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ats;
 
-public class FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
+public record FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string? Method { get; init; }
+    public string? Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string? UrlPath { get; init; }
+    public string? UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<string>? FieldTraversalPath { get; init; }
+    public IEnumerable<string>? FieldTraversalPath { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/FieldMappingApiInstanceResponse.cs b/src/Merge.Client/Ats/Types/FieldMappingApiInstanceResponse.cs
index 016c26ce..d4e4f615 100644
--- a/src/Merge.Client/Ats/Types/FieldMappingApiInstanceResponse.cs
+++ b/src/Merge.Client/Ats/Types/FieldMappingApiInstanceResponse.cs
@@ -1,57 +1,56 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class FieldMappingApiInstanceResponse
+public record FieldMappingApiInstanceResponse
 {
     [JsonPropertyName("Activity")]
-    public IEnumerable<FieldMappingApiInstance>? Activity { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Activity { get; set; }
 
     [JsonPropertyName("Application")]
-    public IEnumerable<FieldMappingApiInstance>? Application { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Application { get; set; }
 
     [JsonPropertyName("Attachment")]
-    public IEnumerable<FieldMappingApiInstance>? Attachment { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Attachment { get; set; }
 
     [JsonPropertyName("Candidate")]
-    public IEnumerable<FieldMappingApiInstance>? Candidate { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Candidate { get; set; }
 
     [JsonPropertyName("Department")]
-    public IEnumerable<FieldMappingApiInstance>? Department { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Department { get; set; }
 
     [JsonPropertyName("EEOC")]
-    public IEnumerable<FieldMappingApiInstance>? Eeoc { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Eeoc { get; set; }
 
     [JsonPropertyName("ScheduledInterview")]
-    public IEnumerable<FieldMappingApiInstance>? ScheduledInterview { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? ScheduledInterview { get; set; }
 
     [JsonPropertyName("Job")]
-    public IEnumerable<FieldMappingApiInstance>? Job { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Job { get; set; }
 
     [JsonPropertyName("JobPosting")]
-    public IEnumerable<FieldMappingApiInstance>? JobPosting { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? JobPosting { get; set; }
 
     [JsonPropertyName("JobInterviewStage")]
-    public IEnumerable<FieldMappingApiInstance>? JobInterviewStage { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? JobInterviewStage { get; set; }
 
     [JsonPropertyName("Offer")]
-    public IEnumerable<FieldMappingApiInstance>? Offer { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Offer { get; set; }
 
     [JsonPropertyName("Office")]
-    public IEnumerable<FieldMappingApiInstance>? Office { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Office { get; set; }
 
     [JsonPropertyName("RejectReason")]
-    public IEnumerable<FieldMappingApiInstance>? RejectReason { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? RejectReason { get; set; }
 
     [JsonPropertyName("Scorecard")]
-    public IEnumerable<FieldMappingApiInstance>? Scorecard { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Scorecard { get; set; }
 
     [JsonPropertyName("Tag")]
-    public IEnumerable<FieldMappingApiInstance>? Tag { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Tag { get; set; }
 
     [JsonPropertyName("RemoteUser")]
-    public IEnumerable<FieldMappingApiInstance>? RemoteUser { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? RemoteUser { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/FieldMappingApiInstanceTargetField.cs b/src/Merge.Client/Ats/Types/FieldMappingApiInstanceTargetField.cs
index 2249b829..c07ac77e 100644
--- a/src/Merge.Client/Ats/Types/FieldMappingApiInstanceTargetField.cs
+++ b/src/Merge.Client/Ats/Types/FieldMappingApiInstanceTargetField.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ats;
 
-public class FieldMappingApiInstanceTargetField
+public record FieldMappingApiInstanceTargetField
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string Description { get; init; }
+    public required string Description { get; set; }
 
     [JsonPropertyName("is_organization_wide")]
-    public bool IsOrganizationWide { get; init; }
+    public required bool IsOrganizationWide { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/FieldMappingInstanceResponse.cs b/src/Merge.Client/Ats/Types/FieldMappingInstanceResponse.cs
index 7afd4dd8..2dff1080 100644
--- a/src/Merge.Client/Ats/Types/FieldMappingInstanceResponse.cs
+++ b/src/Merge.Client/Ats/Types/FieldMappingInstanceResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class FieldMappingInstanceResponse
+public record FieldMappingInstanceResponse
 {
     [JsonPropertyName("model")]
-    public FieldMappingApiInstance Model { get; init; }
+    public required FieldMappingApiInstance Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/FieldPermissionDeserializer.cs b/src/Merge.Client/Ats/Types/FieldPermissionDeserializer.cs
index 744a9cbb..2703f9cb 100644
--- a/src/Merge.Client/Ats/Types/FieldPermissionDeserializer.cs
+++ b/src/Merge.Client/Ats/Types/FieldPermissionDeserializer.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ats;
 
-public class FieldPermissionDeserializer
+public record FieldPermissionDeserializer
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/FieldPermissionDeserializerRequest.cs b/src/Merge.Client/Ats/Types/FieldPermissionDeserializerRequest.cs
index c4e3e624..b2120c94 100644
--- a/src/Merge.Client/Ats/Types/FieldPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Ats/Types/FieldPermissionDeserializerRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ats;
 
-public class FieldPermissionDeserializerRequest
+public record FieldPermissionDeserializerRequest
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/GenderEnum.cs b/src/Merge.Client/Ats/Types/GenderEnum.cs
index 0c124794..00cfa777 100644
--- a/src/Merge.Client/Ats/Types/GenderEnum.cs
+++ b/src/Merge.Client/Ats/Types/GenderEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/IndividualCommonModelScopeDeserializer.cs b/src/Merge.Client/Ats/Types/IndividualCommonModelScopeDeserializer.cs
index 7da6ac3b..ec0a378f 100644
--- a/src/Merge.Client/Ats/Types/IndividualCommonModelScopeDeserializer.cs
+++ b/src/Merge.Client/Ats/Types/IndividualCommonModelScopeDeserializer.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class IndividualCommonModelScopeDeserializer
+public record IndividualCommonModelScopeDeserializer
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializer? FieldPermissions { get; init; }
+    public FieldPermissionDeserializer? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/IndividualCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Ats/Types/IndividualCommonModelScopeDeserializerRequest.cs
index 098cea47..257b74cf 100644
--- a/src/Merge.Client/Ats/Types/IndividualCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Ats/Types/IndividualCommonModelScopeDeserializerRequest.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class IndividualCommonModelScopeDeserializerRequest
+public record IndividualCommonModelScopeDeserializerRequest
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializerRequest? FieldPermissions { get; init; }
+    public FieldPermissionDeserializerRequest? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/Issue.cs b/src/Merge.Client/Ats/Types/Issue.cs
index 8270222f..d25f8e04 100644
--- a/src/Merge.Client/Ats/Types/Issue.cs
+++ b/src/Merge.Client/Ats/Types/Issue.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class Issue
+public record Issue
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -17,23 +16,23 @@ public class Issue
     /// - `RESOLVED` - RESOLVED
     /// </summary>
     [JsonPropertyName("status")]
-    public IssueStatusEnum? Status { get; init; }
+    public IssueStatusEnum? Status { get; set; }
 
     [JsonPropertyName("error_description")]
-    public string ErrorDescription { get; init; }
+    public required string ErrorDescription { get; set; }
 
     [JsonPropertyName("end_user")]
-    public Dictionary<string, object>? EndUser { get; init; }
+    public Dictionary<string, object?>? EndUser { get; set; }
 
     [JsonPropertyName("first_incident_time")]
-    public DateTime? FirstIncidentTime { get; init; }
+    public DateTime? FirstIncidentTime { get; set; }
 
     [JsonPropertyName("last_incident_time")]
-    public DateTime? LastIncidentTime { get; init; }
+    public DateTime? LastIncidentTime { get; set; }
 
     [JsonPropertyName("is_muted")]
-    public bool? IsMuted { get; init; }
+    public bool? IsMuted { get; set; }
 
     [JsonPropertyName("error_details")]
-    public IEnumerable<string>? ErrorDetails { get; init; }
+    public IEnumerable<string>? ErrorDetails { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/IssueStatusEnum.cs b/src/Merge.Client/Ats/Types/IssueStatusEnum.cs
index a79a251e..645d492e 100644
--- a/src/Merge.Client/Ats/Types/IssueStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/IssueStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/Job.cs b/src/Merge.Client/Ats/Types/Job.cs
index 036a368e..8deb3933 100644
--- a/src/Merge.Client/Ats/Types/Job.cs
+++ b/src/Merge.Client/Ats/Types/Job.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,46 +6,46 @@
 
 namespace Merge.Client.Ats;
 
-public class Job
+public record Job
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The job's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The job's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The job's code. Typically an additional identifier used to reference the particular job that is displayed on the ATS.
     /// </summary>
     [JsonPropertyName("code")]
-    public string? Code { get; init; }
+    public string? Code { get; set; }
 
     /// <summary>
     /// The job's status.
@@ -58,7 +57,7 @@ public class Job
     /// - `PENDING` - PENDING
     /// </summary>
     [JsonPropertyName("status")]
-    public JobStatusEnum? Status { get; init; }
+    public JobStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The job's type.
@@ -68,34 +67,34 @@ public class Job
     /// - `PROFILE` - PROFILE
     /// </summary>
     [JsonPropertyName("type")]
-    public JobTypeEnum? Type { get; init; }
+    public JobTypeEnum? Type { get; set; }
 
     /// <summary>
     /// IDs of `JobPosting` objects that serve as job postings for this `Job`.
     /// </summary>
     [JsonPropertyName("job_postings")]
-    public IEnumerable<string>? JobPostings { get; init; }
+    public IEnumerable<string>? JobPostings { get; set; }
 
     [JsonPropertyName("job_posting_urls")]
-    public IEnumerable<Url>? JobPostingUrls { get; init; }
+    public IEnumerable<Url>? JobPostingUrls { get; set; }
 
     /// <summary>
     /// When the third party's job was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's job was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Whether the job is confidential.
     /// </summary>
     [JsonPropertyName("confidential")]
-    public bool? Confidential { get; init; }
+    public bool? Confidential { get; set; }
 
     /// <summary>
     /// IDs of `Department` objects for this `Job`.
@@ -107,7 +106,7 @@ public class Job
             OneOfSerializer<OneOf<string, Department>>
         >)
     )]
-    public IEnumerable<OneOf<string, Department>>? Departments { get; init; }
+    public IEnumerable<OneOf<string, Department>>? Departments { get; set; }
 
     /// <summary>
     /// IDs of `Office` objects for this `Job`.
@@ -119,7 +118,7 @@ public class Job
             OneOfSerializer<OneOf<string, Office>>
         >)
     )]
-    public IEnumerable<OneOf<string, Office>>? Offices { get; init; }
+    public IEnumerable<OneOf<string, Office>>? Offices { get; set; }
 
     /// <summary>
     /// IDs of `RemoteUser` objects that serve as hiring managers for this `Job`.
@@ -131,7 +130,7 @@ public class Job
             OneOfSerializer<OneOf<string, RemoteUser>>
         >)
     )]
-    public IEnumerable<OneOf<string, RemoteUser>>? HiringManagers { get; init; }
+    public IEnumerable<OneOf<string, RemoteUser>>? HiringManagers { get; set; }
 
     /// <summary>
     /// IDs of `RemoteUser` objects that serve as recruiters for this `Job`.
@@ -143,17 +142,17 @@ public class Job
             OneOfSerializer<OneOf<string, RemoteUser>>
         >)
     )]
-    public IEnumerable<OneOf<string, RemoteUser>>? Recruiters { get; init; }
+    public IEnumerable<OneOf<string, RemoteUser>>? Recruiters { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/JobInterviewStage.cs b/src/Merge.Client/Ats/Types/JobInterviewStage.cs
index 1c9474b7..5f88448d 100644
--- a/src/Merge.Client/Ats/Types/JobInterviewStage.cs
+++ b/src/Merge.Client/Ats/Types/JobInterviewStage.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,57 +6,57 @@
 
 namespace Merge.Client.Ats;
 
-public class JobInterviewStage
+public record JobInterviewStage
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// Standard stage names are offered by ATS systems but can be modified by users.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// This field is populated only if the stage is specific to a particular job. If the stage is generic, this field will not be populated.
     /// </summary>
     [JsonPropertyName("job")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Job>>))]
-    public OneOf<string, Job>? Job { get; init; }
+    public OneOf<string, Job>? Job { get; set; }
 
     /// <summary>
     /// The stage’s order, with the lowest values ordered first. If the third-party does not return details on the order of stages, this field will not be populated.
     /// </summary>
     [JsonPropertyName("stage_order")]
-    public int? StageOrder { get; init; }
+    public int? StageOrder { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/JobPosting.cs b/src/Merge.Client/Ats/Types/JobPosting.cs
index d5f50e07..08b86acb 100644
--- a/src/Merge.Client/Ats/Types/JobPosting.cs
+++ b/src/Merge.Client/Ats/Types/JobPosting.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,34 +6,34 @@
 
 namespace Merge.Client.Ats;
 
-public class JobPosting
+public record JobPosting
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The job posting’s title.
     /// </summary>
     [JsonPropertyName("title")]
-    public string? Title { get; init; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// The Url object is used to represent hyperlinks for a candidate to apply to a given job.
@@ -43,14 +42,14 @@ public class JobPosting
     [JsonConverter(
         typeof(CollectionItemSerializer<OneOf<string, Url>, OneOfSerializer<OneOf<string, Url>>>)
     )]
-    public IEnumerable<OneOf<string, Url>>? JobPostingUrls { get; init; }
+    public IEnumerable<OneOf<string, Url>>? JobPostingUrls { get; set; }
 
     /// <summary>
     /// ID of `Job` object for this `JobPosting`.
     /// </summary>
     [JsonPropertyName("job")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Job>>))]
-    public OneOf<string, Job>? Job { get; init; }
+    public OneOf<string, Job>? Job { get; set; }
 
     /// <summary>
     /// The job posting's status.
@@ -62,41 +61,41 @@ public class JobPosting
     /// - `PENDING` - PENDING
     /// </summary>
     [JsonPropertyName("status")]
-    public JobPostingStatusEnum? Status { get; init; }
+    public JobPostingStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The job posting’s content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// When the third party's job posting was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's job posting was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Indicates whether the job posting is internal or external.
     /// </summary>
     [JsonPropertyName("is_internal")]
-    public bool? IsInternal { get; init; }
+    public bool? IsInternal { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/JobPostingStatusEnum.cs b/src/Merge.Client/Ats/Types/JobPostingStatusEnum.cs
index 2827545c..694fca2d 100644
--- a/src/Merge.Client/Ats/Types/JobPostingStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/JobPostingStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/JobStatusEnum.cs b/src/Merge.Client/Ats/Types/JobStatusEnum.cs
index cf7bd2ac..c679e43c 100644
--- a/src/Merge.Client/Ats/Types/JobStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/JobStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/JobTypeEnum.cs b/src/Merge.Client/Ats/Types/JobTypeEnum.cs
index 5e7853ae..073422dd 100644
--- a/src/Merge.Client/Ats/Types/JobTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/JobTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/LinkToken.cs b/src/Merge.Client/Ats/Types/LinkToken.cs
index c4b1e019..8ef6c71c 100644
--- a/src/Merge.Client/Ats/Types/LinkToken.cs
+++ b/src/Merge.Client/Ats/Types/LinkToken.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ats;
 
-public class LinkToken
+public record LinkToken
 {
     [JsonPropertyName("link_token")]
-    public string LinkToken_ { get; init; }
+    public required string LinkToken_ { get; set; }
 
     [JsonPropertyName("integration_name")]
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     [JsonPropertyName("magic_link_url")]
-    public string? MagicLinkUrl { get; init; }
+    public string? MagicLinkUrl { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/LinkedAccountStatus.cs b/src/Merge.Client/Ats/Types/LinkedAccountStatus.cs
index 39de0729..8c173f5d 100644
--- a/src/Merge.Client/Ats/Types/LinkedAccountStatus.cs
+++ b/src/Merge.Client/Ats/Types/LinkedAccountStatus.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ats;
 
-public class LinkedAccountStatus
+public record LinkedAccountStatus
 {
     [JsonPropertyName("linked_account_status")]
-    public string LinkedAccountStatus_ { get; init; }
+    public required string LinkedAccountStatus_ { get; set; }
 
     [JsonPropertyName("can_make_request")]
-    public bool CanMakeRequest { get; init; }
+    public required bool CanMakeRequest { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/MetaResponse.cs b/src/Merge.Client/Ats/Types/MetaResponse.cs
index e68543c6..61f5c725 100644
--- a/src/Merge.Client/Ats/Types/MetaResponse.cs
+++ b/src/Merge.Client/Ats/Types/MetaResponse.cs
@@ -1,24 +1,24 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class MetaResponse
+public record MetaResponse
 {
     [JsonPropertyName("request_schema")]
-    public Dictionary<string, object> RequestSchema { get; init; }
+    public Dictionary<string, object?> RequestSchema { get; set; } =
+        new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_field_classes")]
-    public Dictionary<string, object>? RemoteFieldClasses { get; init; }
+    public Dictionary<string, object?>? RemoteFieldClasses { get; set; }
 
     [JsonPropertyName("status")]
-    public LinkedAccountStatus? Status { get; init; }
+    public LinkedAccountStatus? Status { get; set; }
 
     [JsonPropertyName("has_conditional_params")]
-    public bool HasConditionalParams { get; init; }
+    public required bool HasConditionalParams { get; set; }
 
     [JsonPropertyName("has_required_linked_account_params")]
-    public bool HasRequiredLinkedAccountParams { get; init; }
+    public required bool HasRequiredLinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/MethodEnum.cs b/src/Merge.Client/Ats/Types/MethodEnum.cs
index be21f00a..93ee44b9 100644
--- a/src/Merge.Client/Ats/Types/MethodEnum.cs
+++ b/src/Merge.Client/Ats/Types/MethodEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/ModelOperation.cs b/src/Merge.Client/Ats/Types/ModelOperation.cs
index 231a3745..97d9501b 100644
--- a/src/Merge.Client/Ats/Types/ModelOperation.cs
+++ b/src/Merge.Client/Ats/Types/ModelOperation.cs
@@ -4,17 +4,17 @@
 
 namespace Merge.Client.Ats;
 
-public class ModelOperation
+public record ModelOperation
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("available_operations")]
-    public IEnumerable<string> AvailableOperations { get; init; }
+    public IEnumerable<string> AvailableOperations { get; set; } = new List<string>();
 
     [JsonPropertyName("required_post_parameters")]
-    public IEnumerable<string> RequiredPostParameters { get; init; }
+    public IEnumerable<string> RequiredPostParameters { get; set; } = new List<string>();
 
     [JsonPropertyName("supported_fields")]
-    public IEnumerable<string> SupportedFields { get; init; }
+    public IEnumerable<string> SupportedFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Ats/Types/ModelPermissionDeserializer.cs b/src/Merge.Client/Ats/Types/ModelPermissionDeserializer.cs
index 1f77a80c..08e17d1f 100644
--- a/src/Merge.Client/Ats/Types/ModelPermissionDeserializer.cs
+++ b/src/Merge.Client/Ats/Types/ModelPermissionDeserializer.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Ats;
 
-public class ModelPermissionDeserializer
+public record ModelPermissionDeserializer
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ModelPermissionDeserializerRequest.cs b/src/Merge.Client/Ats/Types/ModelPermissionDeserializerRequest.cs
index ed0046ac..04d71627 100644
--- a/src/Merge.Client/Ats/Types/ModelPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Ats/Types/ModelPermissionDeserializerRequest.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Ats;
 
-public class ModelPermissionDeserializerRequest
+public record ModelPermissionDeserializerRequest
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/MultipartFormFieldRequest.cs b/src/Merge.Client/Ats/Types/MultipartFormFieldRequest.cs
index f36e750f..333fa08c 100644
--- a/src/Merge.Client/Ats/Types/MultipartFormFieldRequest.cs
+++ b/src/Merge.Client/Ats/Types/MultipartFormFieldRequest.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class MultipartFormFieldRequest
+public record MultipartFormFieldRequest
 {
     /// <summary>
     /// The name of the form field
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// The data for the form field.
     /// </summary>
     [JsonPropertyName("data")]
-    public string Data { get; init; }
+    public required string Data { get; set; }
 
     /// <summary>
     /// The encoding of the value of `data`. Defaults to `RAW` if not defined.
@@ -27,17 +26,17 @@ public class MultipartFormFieldRequest
     /// - `GZIP_BASE64` - GZIP_BASE64
     /// </summary>
     [JsonPropertyName("encoding")]
-    public EncodingEnum? Encoding { get; init; }
+    public EncodingEnum? Encoding { get; set; }
 
     /// <summary>
     /// The file name of the form field, if the field is for a file.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The MIME type of the file, if the field is for a file.
     /// </summary>
     [JsonPropertyName("content_type")]
-    public string? ContentType { get; init; }
+    public string? ContentType { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/Offer.cs b/src/Merge.Client/Ats/Types/Offer.cs
index 9fb18dc2..de67affc 100644
--- a/src/Merge.Client/Ats/Types/Offer.cs
+++ b/src/Merge.Client/Ats/Types/Offer.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,66 +6,66 @@
 
 namespace Merge.Client.Ats;
 
-public class Offer
+public record Offer
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The application who is receiving the offer.
     /// </summary>
     [JsonPropertyName("application")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Application>>))]
-    public OneOf<string, Application>? Application { get; init; }
+    public OneOf<string, Application>? Application { get; set; }
 
     /// <summary>
     /// The user who created the offer.
     /// </summary>
     [JsonPropertyName("creator")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteUser>>))]
-    public OneOf<string, RemoteUser>? Creator { get; init; }
+    public OneOf<string, RemoteUser>? Creator { get; set; }
 
     /// <summary>
     /// When the third party's offer was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the offer was closed.
     /// </summary>
     [JsonPropertyName("closed_at")]
-    public DateTime? ClosedAt { get; init; }
+    public DateTime? ClosedAt { get; set; }
 
     /// <summary>
     /// When the offer was sent.
     /// </summary>
     [JsonPropertyName("sent_at")]
-    public DateTime? SentAt { get; init; }
+    public DateTime? SentAt { get; set; }
 
     /// <summary>
     /// The employment start date on the offer.
     /// </summary>
     [JsonPropertyName("start_date")]
-    public DateTime? StartDate { get; init; }
+    public DateTime? StartDate { get; set; }
 
     /// <summary>
     /// The offer's status.
@@ -82,17 +81,17 @@ public class Offer
     /// - `DEPRECATED` - DEPRECATED
     /// </summary>
     [JsonPropertyName("status")]
-    public OfferStatusEnum? Status { get; init; }
+    public OfferStatusEnum? Status { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/OfferStatusEnum.cs b/src/Merge.Client/Ats/Types/OfferStatusEnum.cs
index 4fd04334..68cf5432 100644
--- a/src/Merge.Client/Ats/Types/OfferStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/OfferStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/Office.cs b/src/Merge.Client/Ats/Types/Office.cs
index fb749ec5..edb984ca 100644
--- a/src/Merge.Client/Ats/Types/Office.cs
+++ b/src/Merge.Client/Ats/Types/Office.cs
@@ -1,54 +1,53 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class Office
+public record Office
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The office's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The office's location.
     /// </summary>
     [JsonPropertyName("location")]
-    public string? Location { get; init; }
+    public string? Location { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/OverallRecommendationEnum.cs b/src/Merge.Client/Ats/Types/OverallRecommendationEnum.cs
index 6d9697ae..803f3e97 100644
--- a/src/Merge.Client/Ats/Types/OverallRecommendationEnum.cs
+++ b/src/Merge.Client/Ats/Types/OverallRecommendationEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/PaginatedAccountDetailsAndActionsList.cs b/src/Merge.Client/Ats/Types/PaginatedAccountDetailsAndActionsList.cs
index 6fd2526b..29cdf24a 100644
--- a/src/Merge.Client/Ats/Types/PaginatedAccountDetailsAndActionsList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedAccountDetailsAndActionsList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedAccountDetailsAndActionsList
+public record PaginatedAccountDetailsAndActionsList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AccountDetailsAndActions>? Results { get; init; }
+    public IEnumerable<AccountDetailsAndActions>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedActivityList.cs b/src/Merge.Client/Ats/Types/PaginatedActivityList.cs
index 3568b883..4b5bea93 100644
--- a/src/Merge.Client/Ats/Types/PaginatedActivityList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedActivityList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedActivityList
+public record PaginatedActivityList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Activity>? Results { get; init; }
+    public IEnumerable<Activity>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedApplicationList.cs b/src/Merge.Client/Ats/Types/PaginatedApplicationList.cs
index 952a634f..60c1af63 100644
--- a/src/Merge.Client/Ats/Types/PaginatedApplicationList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedApplicationList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedApplicationList
+public record PaginatedApplicationList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Application>? Results { get; init; }
+    public IEnumerable<Application>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedAttachmentList.cs b/src/Merge.Client/Ats/Types/PaginatedAttachmentList.cs
index 3fef18ae..c596df9c 100644
--- a/src/Merge.Client/Ats/Types/PaginatedAttachmentList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedAttachmentList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedAttachmentList
+public record PaginatedAttachmentList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Attachment>? Results { get; init; }
+    public IEnumerable<Attachment>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedAuditLogEventList.cs b/src/Merge.Client/Ats/Types/PaginatedAuditLogEventList.cs
index a2b69e0b..94014992 100644
--- a/src/Merge.Client/Ats/Types/PaginatedAuditLogEventList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedAuditLogEventList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedAuditLogEventList
+public record PaginatedAuditLogEventList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AuditLogEvent>? Results { get; init; }
+    public IEnumerable<AuditLogEvent>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedCandidateList.cs b/src/Merge.Client/Ats/Types/PaginatedCandidateList.cs
index 80017fc8..3c8c3b71 100644
--- a/src/Merge.Client/Ats/Types/PaginatedCandidateList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedCandidateList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedCandidateList
+public record PaginatedCandidateList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Candidate>? Results { get; init; }
+    public IEnumerable<Candidate>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedDepartmentList.cs b/src/Merge.Client/Ats/Types/PaginatedDepartmentList.cs
index 031e574c..9503fe80 100644
--- a/src/Merge.Client/Ats/Types/PaginatedDepartmentList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedDepartmentList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedDepartmentList
+public record PaginatedDepartmentList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Department>? Results { get; init; }
+    public IEnumerable<Department>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedEeocList.cs b/src/Merge.Client/Ats/Types/PaginatedEeocList.cs
index 23c498b9..abdaf522 100644
--- a/src/Merge.Client/Ats/Types/PaginatedEeocList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedEeocList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedEeocList
+public record PaginatedEeocList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Eeoc>? Results { get; init; }
+    public IEnumerable<Eeoc>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedIssueList.cs b/src/Merge.Client/Ats/Types/PaginatedIssueList.cs
index 7ad6a294..4bee5895 100644
--- a/src/Merge.Client/Ats/Types/PaginatedIssueList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedIssueList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedIssueList
+public record PaginatedIssueList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Issue>? Results { get; init; }
+    public IEnumerable<Issue>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedJobInterviewStageList.cs b/src/Merge.Client/Ats/Types/PaginatedJobInterviewStageList.cs
index 782a240f..1107d3af 100644
--- a/src/Merge.Client/Ats/Types/PaginatedJobInterviewStageList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedJobInterviewStageList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedJobInterviewStageList
+public record PaginatedJobInterviewStageList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<JobInterviewStage>? Results { get; init; }
+    public IEnumerable<JobInterviewStage>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedJobList.cs b/src/Merge.Client/Ats/Types/PaginatedJobList.cs
index f502954c..97fc192a 100644
--- a/src/Merge.Client/Ats/Types/PaginatedJobList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedJobList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedJobList
+public record PaginatedJobList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Job>? Results { get; init; }
+    public IEnumerable<Job>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedJobPostingList.cs b/src/Merge.Client/Ats/Types/PaginatedJobPostingList.cs
index efa12a6d..f80724ae 100644
--- a/src/Merge.Client/Ats/Types/PaginatedJobPostingList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedJobPostingList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedJobPostingList
+public record PaginatedJobPostingList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<JobPosting>? Results { get; init; }
+    public IEnumerable<JobPosting>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedOfferList.cs b/src/Merge.Client/Ats/Types/PaginatedOfferList.cs
index 7b6de5b0..123cd790 100644
--- a/src/Merge.Client/Ats/Types/PaginatedOfferList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedOfferList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedOfferList
+public record PaginatedOfferList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Offer>? Results { get; init; }
+    public IEnumerable<Offer>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedOfficeList.cs b/src/Merge.Client/Ats/Types/PaginatedOfficeList.cs
index a55d0837..ef32ab09 100644
--- a/src/Merge.Client/Ats/Types/PaginatedOfficeList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedOfficeList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedOfficeList
+public record PaginatedOfficeList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Office>? Results { get; init; }
+    public IEnumerable<Office>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedRejectReasonList.cs b/src/Merge.Client/Ats/Types/PaginatedRejectReasonList.cs
index 61c76e4c..02549bdb 100644
--- a/src/Merge.Client/Ats/Types/PaginatedRejectReasonList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedRejectReasonList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedRejectReasonList
+public record PaginatedRejectReasonList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<RejectReason>? Results { get; init; }
+    public IEnumerable<RejectReason>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedRemoteUserList.cs b/src/Merge.Client/Ats/Types/PaginatedRemoteUserList.cs
index d0149205..afd623f2 100644
--- a/src/Merge.Client/Ats/Types/PaginatedRemoteUserList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedRemoteUserList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedRemoteUserList
+public record PaginatedRemoteUserList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<RemoteUser>? Results { get; init; }
+    public IEnumerable<RemoteUser>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedScheduledInterviewList.cs b/src/Merge.Client/Ats/Types/PaginatedScheduledInterviewList.cs
index 137d526b..96679961 100644
--- a/src/Merge.Client/Ats/Types/PaginatedScheduledInterviewList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedScheduledInterviewList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedScheduledInterviewList
+public record PaginatedScheduledInterviewList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<ScheduledInterview>? Results { get; init; }
+    public IEnumerable<ScheduledInterview>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedScorecardList.cs b/src/Merge.Client/Ats/Types/PaginatedScorecardList.cs
index c2cce529..847ec96c 100644
--- a/src/Merge.Client/Ats/Types/PaginatedScorecardList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedScorecardList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedScorecardList
+public record PaginatedScorecardList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Scorecard>? Results { get; init; }
+    public IEnumerable<Scorecard>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedScreeningQuestionList.cs b/src/Merge.Client/Ats/Types/PaginatedScreeningQuestionList.cs
index 7958af80..dd8810b8 100644
--- a/src/Merge.Client/Ats/Types/PaginatedScreeningQuestionList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedScreeningQuestionList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedScreeningQuestionList
+public record PaginatedScreeningQuestionList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<ScreeningQuestion>? Results { get; init; }
+    public IEnumerable<ScreeningQuestion>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedSyncStatusList.cs b/src/Merge.Client/Ats/Types/PaginatedSyncStatusList.cs
index 6fcd781d..36370ddb 100644
--- a/src/Merge.Client/Ats/Types/PaginatedSyncStatusList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedSyncStatusList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedSyncStatusList
+public record PaginatedSyncStatusList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<SyncStatus>? Results { get; init; }
+    public IEnumerable<SyncStatus>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PaginatedTagList.cs b/src/Merge.Client/Ats/Types/PaginatedTagList.cs
index 25f95a7a..d70853d3 100644
--- a/src/Merge.Client/Ats/Types/PaginatedTagList.cs
+++ b/src/Merge.Client/Ats/Types/PaginatedTagList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PaginatedTagList
+public record PaginatedTagList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Tag>? Results { get; init; }
+    public IEnumerable<Tag>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PatchedCandidateRequest.cs b/src/Merge.Client/Ats/Types/PatchedCandidateRequest.cs
index bc751a6c..438dc99f 100644
--- a/src/Merge.Client/Ats/Types/PatchedCandidateRequest.cs
+++ b/src/Merge.Client/Ats/Types/PatchedCandidateRequest.cs
@@ -1,93 +1,92 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PatchedCandidateRequest
+public record PatchedCandidateRequest
 {
     /// <summary>
     /// The candidate's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The candidate's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The candidate's current company.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// The candidate's current title.
     /// </summary>
     [JsonPropertyName("title")]
-    public string? Title { get; init; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// When the most recent interaction with the candidate occurred.
     /// </summary>
     [JsonPropertyName("last_interaction_at")]
-    public DateTime? LastInteractionAt { get; init; }
+    public DateTime? LastInteractionAt { get; set; }
 
     /// <summary>
     /// Whether or not the candidate is private.
     /// </summary>
     [JsonPropertyName("is_private")]
-    public bool? IsPrivate { get; init; }
+    public bool? IsPrivate { get; set; }
 
     /// <summary>
     /// Whether or not the candidate can be emailed.
     /// </summary>
     [JsonPropertyName("can_email")]
-    public bool? CanEmail { get; init; }
+    public bool? CanEmail { get; set; }
 
     /// <summary>
     /// The candidate's locations.
     /// </summary>
     [JsonPropertyName("locations")]
-    public IEnumerable<string>? Locations { get; init; }
+    public IEnumerable<string>? Locations { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; set; }
 
     [JsonPropertyName("email_addresses")]
-    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; init; }
+    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; set; }
 
     [JsonPropertyName("urls")]
-    public IEnumerable<UrlRequest>? Urls { get; init; }
+    public IEnumerable<UrlRequest>? Urls { get; set; }
 
     /// <summary>
     /// Array of `Tag` names as strings.
     /// </summary>
     [JsonPropertyName("tags")]
-    public IEnumerable<string>? Tags { get; init; }
+    public IEnumerable<string>? Tags { get; set; }
 
     /// <summary>
     /// Array of `Application` object IDs.
     /// </summary>
     [JsonPropertyName("applications")]
-    public IEnumerable<string>? Applications { get; init; }
+    public IEnumerable<string>? Applications { get; set; }
 
     /// <summary>
     /// Array of `Attachment` object IDs.
     /// </summary>
     [JsonPropertyName("attachments")]
-    public IEnumerable<string>? Attachments { get; init; }
+    public IEnumerable<string>? Attachments { get; set; }
 
     [JsonPropertyName("remote_template_id")]
-    public string? RemoteTemplateId { get; init; }
+    public string? RemoteTemplateId { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PhoneNumber.cs b/src/Merge.Client/Ats/Types/PhoneNumber.cs
index 1811f8d3..ac321b3b 100644
--- a/src/Merge.Client/Ats/Types/PhoneNumber.cs
+++ b/src/Merge.Client/Ats/Types/PhoneNumber.cs
@@ -1,29 +1,28 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PhoneNumber
+public record PhoneNumber
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The phone number.
     /// </summary>
     [JsonPropertyName("value")]
-    public string? Value { get; init; }
+    public string? Value { get; set; }
 
     /// <summary>
     /// The type of phone number.
@@ -35,11 +34,11 @@ public class PhoneNumber
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("phone_number_type")]
-    public PhoneNumberTypeEnum? PhoneNumberType { get; init; }
+    public PhoneNumberTypeEnum? PhoneNumberType { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PhoneNumberRequest.cs b/src/Merge.Client/Ats/Types/PhoneNumberRequest.cs
index 3ce12722..3ff20b9b 100644
--- a/src/Merge.Client/Ats/Types/PhoneNumberRequest.cs
+++ b/src/Merge.Client/Ats/Types/PhoneNumberRequest.cs
@@ -1,17 +1,16 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class PhoneNumberRequest
+public record PhoneNumberRequest
 {
     /// <summary>
     /// The phone number.
     /// </summary>
     [JsonPropertyName("value")]
-    public string? Value { get; init; }
+    public string? Value { get; set; }
 
     /// <summary>
     /// The type of phone number.
@@ -23,11 +22,11 @@ public class PhoneNumberRequest
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("phone_number_type")]
-    public PhoneNumberTypeEnum? PhoneNumberType { get; init; }
+    public PhoneNumberTypeEnum? PhoneNumberType { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/PhoneNumberTypeEnum.cs b/src/Merge.Client/Ats/Types/PhoneNumberTypeEnum.cs
index 0acc990e..9ae4a1bd 100644
--- a/src/Merge.Client/Ats/Types/PhoneNumberTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/PhoneNumberTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/RaceEnum.cs b/src/Merge.Client/Ats/Types/RaceEnum.cs
index 164f4caa..65e6b296 100644
--- a/src/Merge.Client/Ats/Types/RaceEnum.cs
+++ b/src/Merge.Client/Ats/Types/RaceEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/ReasonEnum.cs b/src/Merge.Client/Ats/Types/ReasonEnum.cs
index 5edd34ef..52917478 100644
--- a/src/Merge.Client/Ats/Types/ReasonEnum.cs
+++ b/src/Merge.Client/Ats/Types/ReasonEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/RejectReason.cs b/src/Merge.Client/Ats/Types/RejectReason.cs
index 6c0e0a1c..796e7f8b 100644
--- a/src/Merge.Client/Ats/Types/RejectReason.cs
+++ b/src/Merge.Client/Ats/Types/RejectReason.cs
@@ -1,48 +1,47 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class RejectReason
+public record RejectReason
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The rejection reason’s name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/RemoteData.cs b/src/Merge.Client/Ats/Types/RemoteData.cs
index f888fb4c..93aeacfa 100644
--- a/src/Merge.Client/Ats/Types/RemoteData.cs
+++ b/src/Merge.Client/Ats/Types/RemoteData.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ats;
 
-public class RemoteData
+public record RemoteData
 {
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("data")]
-    public object? Data { get; init; }
+    public object? Data { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/RemoteEndpointInfo.cs b/src/Merge.Client/Ats/Types/RemoteEndpointInfo.cs
index 6cae5208..bfeb2b7c 100644
--- a/src/Merge.Client/Ats/Types/RemoteEndpointInfo.cs
+++ b/src/Merge.Client/Ats/Types/RemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ats;
 
-public class RemoteEndpointInfo
+public record RemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string UrlPath { get; init; }
+    public required string UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<object> FieldTraversalPath { get; init; }
+    public IEnumerable<object> FieldTraversalPath { get; set; } = new List<object>();
 }
diff --git a/src/Merge.Client/Ats/Types/RemoteFieldApi.cs b/src/Merge.Client/Ats/Types/RemoteFieldApi.cs
index 63c9b1eb..8d95d554 100644
--- a/src/Merge.Client/Ats/Types/RemoteFieldApi.cs
+++ b/src/Merge.Client/Ats/Types/RemoteFieldApi.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,24 +6,24 @@
 
 namespace Merge.Client.Ats;
 
-public class RemoteFieldApi
+public record RemoteFieldApi
 {
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("remote_endpoint_info")]
-    public RemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required RemoteEndpointInfo RemoteEndpointInfo { get; set; }
 
     [JsonPropertyName("example_values")]
-    public IEnumerable<object>? ExampleValues { get; init; }
+    public IEnumerable<object>? ExampleValues { get; set; }
 
     [JsonPropertyName("advanced_metadata")]
-    public AdvancedMetadata? AdvancedMetadata { get; init; }
+    public AdvancedMetadata? AdvancedMetadata { get; set; }
 
     [JsonPropertyName("coverage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<int, double>>))]
-    public OneOf<int, double>? Coverage { get; init; }
+    public OneOf<int, double>? Coverage { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/RemoteFieldApiResponse.cs b/src/Merge.Client/Ats/Types/RemoteFieldApiResponse.cs
index 27314fe9..d5526f2d 100644
--- a/src/Merge.Client/Ats/Types/RemoteFieldApiResponse.cs
+++ b/src/Merge.Client/Ats/Types/RemoteFieldApiResponse.cs
@@ -1,57 +1,56 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class RemoteFieldApiResponse
+public record RemoteFieldApiResponse
 {
     [JsonPropertyName("Activity")]
-    public IEnumerable<RemoteFieldApi>? Activity { get; init; }
+    public IEnumerable<RemoteFieldApi>? Activity { get; set; }
 
     [JsonPropertyName("Application")]
-    public IEnumerable<RemoteFieldApi>? Application { get; init; }
+    public IEnumerable<RemoteFieldApi>? Application { get; set; }
 
     [JsonPropertyName("Attachment")]
-    public IEnumerable<RemoteFieldApi>? Attachment { get; init; }
+    public IEnumerable<RemoteFieldApi>? Attachment { get; set; }
 
     [JsonPropertyName("Candidate")]
-    public IEnumerable<RemoteFieldApi>? Candidate { get; init; }
+    public IEnumerable<RemoteFieldApi>? Candidate { get; set; }
 
     [JsonPropertyName("Department")]
-    public IEnumerable<RemoteFieldApi>? Department { get; init; }
+    public IEnumerable<RemoteFieldApi>? Department { get; set; }
 
     [JsonPropertyName("EEOC")]
-    public IEnumerable<RemoteFieldApi>? Eeoc { get; init; }
+    public IEnumerable<RemoteFieldApi>? Eeoc { get; set; }
 
     [JsonPropertyName("ScheduledInterview")]
-    public IEnumerable<RemoteFieldApi>? ScheduledInterview { get; init; }
+    public IEnumerable<RemoteFieldApi>? ScheduledInterview { get; set; }
 
     [JsonPropertyName("Job")]
-    public IEnumerable<RemoteFieldApi>? Job { get; init; }
+    public IEnumerable<RemoteFieldApi>? Job { get; set; }
 
     [JsonPropertyName("JobPosting")]
-    public IEnumerable<RemoteFieldApi>? JobPosting { get; init; }
+    public IEnumerable<RemoteFieldApi>? JobPosting { get; set; }
 
     [JsonPropertyName("JobInterviewStage")]
-    public IEnumerable<RemoteFieldApi>? JobInterviewStage { get; init; }
+    public IEnumerable<RemoteFieldApi>? JobInterviewStage { get; set; }
 
     [JsonPropertyName("Offer")]
-    public IEnumerable<RemoteFieldApi>? Offer { get; init; }
+    public IEnumerable<RemoteFieldApi>? Offer { get; set; }
 
     [JsonPropertyName("Office")]
-    public IEnumerable<RemoteFieldApi>? Office { get; init; }
+    public IEnumerable<RemoteFieldApi>? Office { get; set; }
 
     [JsonPropertyName("RejectReason")]
-    public IEnumerable<RemoteFieldApi>? RejectReason { get; init; }
+    public IEnumerable<RemoteFieldApi>? RejectReason { get; set; }
 
     [JsonPropertyName("Scorecard")]
-    public IEnumerable<RemoteFieldApi>? Scorecard { get; init; }
+    public IEnumerable<RemoteFieldApi>? Scorecard { get; set; }
 
     [JsonPropertyName("Tag")]
-    public IEnumerable<RemoteFieldApi>? Tag { get; init; }
+    public IEnumerable<RemoteFieldApi>? Tag { get; set; }
 
     [JsonPropertyName("RemoteUser")]
-    public IEnumerable<RemoteFieldApi>? RemoteUser { get; init; }
+    public IEnumerable<RemoteFieldApi>? RemoteUser { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/RemoteKey.cs b/src/Merge.Client/Ats/Types/RemoteKey.cs
index 0a2bf3d0..1afb7342 100644
--- a/src/Merge.Client/Ats/Types/RemoteKey.cs
+++ b/src/Merge.Client/Ats/Types/RemoteKey.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ats;
 
-public class RemoteKey
+public record RemoteKey
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("key")]
-    public string Key { get; init; }
+    public required string Key { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/RemoteResponse.cs b/src/Merge.Client/Ats/Types/RemoteResponse.cs
index 69fa0ca1..315e964f 100644
--- a/src/Merge.Client/Ats/Types/RemoteResponse.cs
+++ b/src/Merge.Client/Ats/Types/RemoteResponse.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class RemoteResponse
+public record RemoteResponse
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("status")]
-    public int Status { get; init; }
+    public required int Status { get; set; }
 
     [JsonPropertyName("response")]
-    public object Response { get; init; }
+    public required object Response { get; set; }
 
     [JsonPropertyName("response_headers")]
-    public Dictionary<string, object>? ResponseHeaders { get; init; }
+    public Dictionary<string, object?>? ResponseHeaders { get; set; }
 
     [JsonPropertyName("response_type")]
-    public ResponseTypeEnum? ResponseType { get; init; }
+    public ResponseTypeEnum? ResponseType { get; set; }
 
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/RemoteUser.cs b/src/Merge.Client/Ats/Types/RemoteUser.cs
index 558b1a58..ec1eee7a 100644
--- a/src/Merge.Client/Ats/Types/RemoteUser.cs
+++ b/src/Merge.Client/Ats/Types/RemoteUser.cs
@@ -1,62 +1,61 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class RemoteUser
+public record RemoteUser
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The user's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The user's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The user's email.
     /// </summary>
     [JsonPropertyName("email")]
-    public string? Email { get; init; }
+    public string? Email { get; set; }
 
     /// <summary>
     /// Whether the user's account had been disabled.
     /// </summary>
     [JsonPropertyName("disabled")]
-    public bool? Disabled { get; init; }
+    public bool? Disabled { get; set; }
 
     /// <summary>
     /// When the third party's user was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// The user's role.
@@ -68,17 +67,17 @@ public class RemoteUser
     /// - `INTERVIEWER` - INTERVIEWER
     /// </summary>
     [JsonPropertyName("access_role")]
-    public AccessRoleEnum? AccessRole { get; init; }
+    public AccessRoleEnum? AccessRole { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/RequestFormatEnum.cs b/src/Merge.Client/Ats/Types/RequestFormatEnum.cs
index ee4c3760..b46baf3c 100644
--- a/src/Merge.Client/Ats/Types/RequestFormatEnum.cs
+++ b/src/Merge.Client/Ats/Types/RequestFormatEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/ResponseTypeEnum.cs b/src/Merge.Client/Ats/Types/ResponseTypeEnum.cs
index 07ab50b2..d1674f3a 100644
--- a/src/Merge.Client/Ats/Types/ResponseTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/ResponseTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/RoleEnum.cs b/src/Merge.Client/Ats/Types/RoleEnum.cs
index 48215f41..0dac9244 100644
--- a/src/Merge.Client/Ats/Types/RoleEnum.cs
+++ b/src/Merge.Client/Ats/Types/RoleEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/ScheduledInterview.cs b/src/Merge.Client/Ats/Types/ScheduledInterview.cs
index 96d43f0f..7adc940e 100644
--- a/src/Merge.Client/Ats/Types/ScheduledInterview.cs
+++ b/src/Merge.Client/Ats/Types/ScheduledInterview.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,49 +6,49 @@
 
 namespace Merge.Client.Ats;
 
-public class ScheduledInterview
+public record ScheduledInterview
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The application being interviewed.
     /// </summary>
     [JsonPropertyName("application")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Application>>))]
-    public OneOf<string, Application>? Application { get; init; }
+    public OneOf<string, Application>? Application { get; set; }
 
     /// <summary>
     /// The stage of the interview.
     /// </summary>
     [JsonPropertyName("job_interview_stage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, JobInterviewStage>>))]
-    public OneOf<string, JobInterviewStage>? JobInterviewStage { get; init; }
+    public OneOf<string, JobInterviewStage>? JobInterviewStage { get; set; }
 
     /// <summary>
     /// The user organizing the interview.
     /// </summary>
     [JsonPropertyName("organizer")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteUser>>))]
-    public OneOf<string, RemoteUser>? Organizer { get; init; }
+    public OneOf<string, RemoteUser>? Organizer { get; set; }
 
     /// <summary>
     /// Array of `RemoteUser` IDs.
@@ -61,37 +60,37 @@ public class ScheduledInterview
             OneOfSerializer<OneOf<string, RemoteUser>>
         >)
     )]
-    public IEnumerable<OneOf<string, RemoteUser>>? Interviewers { get; init; }
+    public IEnumerable<OneOf<string, RemoteUser>>? Interviewers { get; set; }
 
     /// <summary>
     /// The interview's location.
     /// </summary>
     [JsonPropertyName("location")]
-    public string? Location { get; init; }
+    public string? Location { get; set; }
 
     /// <summary>
     /// When the interview was started.
     /// </summary>
     [JsonPropertyName("start_at")]
-    public DateTime? StartAt { get; init; }
+    public DateTime? StartAt { get; set; }
 
     /// <summary>
     /// When the interview was ended.
     /// </summary>
     [JsonPropertyName("end_at")]
-    public DateTime? EndAt { get; init; }
+    public DateTime? EndAt { get; set; }
 
     /// <summary>
     /// When the third party's interview was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's interview was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// The interview's status.
@@ -101,17 +100,17 @@ public class ScheduledInterview
     /// - `COMPLETE` - COMPLETE
     /// </summary>
     [JsonPropertyName("status")]
-    public ScheduledInterviewStatusEnum? Status { get; init; }
+    public ScheduledInterviewStatusEnum? Status { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ScheduledInterviewRequest.cs b/src/Merge.Client/Ats/Types/ScheduledInterviewRequest.cs
index ea3d3701..6dec629b 100644
--- a/src/Merge.Client/Ats/Types/ScheduledInterviewRequest.cs
+++ b/src/Merge.Client/Ats/Types/ScheduledInterviewRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,28 +6,28 @@
 
 namespace Merge.Client.Ats;
 
-public class ScheduledInterviewRequest
+public record ScheduledInterviewRequest
 {
     /// <summary>
     /// The application being interviewed.
     /// </summary>
     [JsonPropertyName("application")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Application>>))]
-    public OneOf<string, Application>? Application { get; init; }
+    public OneOf<string, Application>? Application { get; set; }
 
     /// <summary>
     /// The stage of the interview.
     /// </summary>
     [JsonPropertyName("job_interview_stage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, JobInterviewStage>>))]
-    public OneOf<string, JobInterviewStage>? JobInterviewStage { get; init; }
+    public OneOf<string, JobInterviewStage>? JobInterviewStage { get; set; }
 
     /// <summary>
     /// The user organizing the interview.
     /// </summary>
     [JsonPropertyName("organizer")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteUser>>))]
-    public OneOf<string, RemoteUser>? Organizer { get; init; }
+    public OneOf<string, RemoteUser>? Organizer { get; set; }
 
     /// <summary>
     /// Array of `RemoteUser` IDs.
@@ -40,25 +39,25 @@ public class ScheduledInterviewRequest
             OneOfSerializer<OneOf<string, RemoteUser>>
         >)
     )]
-    public IEnumerable<OneOf<string, RemoteUser>>? Interviewers { get; init; }
+    public IEnumerable<OneOf<string, RemoteUser>>? Interviewers { get; set; }
 
     /// <summary>
     /// The interview's location.
     /// </summary>
     [JsonPropertyName("location")]
-    public string? Location { get; init; }
+    public string? Location { get; set; }
 
     /// <summary>
     /// When the interview was started.
     /// </summary>
     [JsonPropertyName("start_at")]
-    public DateTime? StartAt { get; init; }
+    public DateTime? StartAt { get; set; }
 
     /// <summary>
     /// When the interview was ended.
     /// </summary>
     [JsonPropertyName("end_at")]
-    public DateTime? EndAt { get; init; }
+    public DateTime? EndAt { get; set; }
 
     /// <summary>
     /// The interview's status.
@@ -68,11 +67,11 @@ public class ScheduledInterviewRequest
     /// - `COMPLETE` - COMPLETE
     /// </summary>
     [JsonPropertyName("status")]
-    public ScheduledInterviewStatusEnum? Status { get; init; }
+    public ScheduledInterviewStatusEnum? Status { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ScheduledInterviewResponse.cs b/src/Merge.Client/Ats/Types/ScheduledInterviewResponse.cs
index 52708448..d54cd23a 100644
--- a/src/Merge.Client/Ats/Types/ScheduledInterviewResponse.cs
+++ b/src/Merge.Client/Ats/Types/ScheduledInterviewResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class ScheduledInterviewResponse
+public record ScheduledInterviewResponse
 {
     [JsonPropertyName("model")]
-    public ScheduledInterview Model { get; init; }
+    public required ScheduledInterview Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ScheduledInterviewStatusEnum.cs b/src/Merge.Client/Ats/Types/ScheduledInterviewStatusEnum.cs
index 53174c50..06e05f95 100644
--- a/src/Merge.Client/Ats/Types/ScheduledInterviewStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/ScheduledInterviewStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/Scorecard.cs b/src/Merge.Client/Ats/Types/Scorecard.cs
index 8e31a6d8..097bf993 100644
--- a/src/Merge.Client/Ats/Types/Scorecard.cs
+++ b/src/Merge.Client/Ats/Types/Scorecard.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,61 +6,61 @@
 
 namespace Merge.Client.Ats;
 
-public class Scorecard
+public record Scorecard
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The application being scored.
     /// </summary>
     [JsonPropertyName("application")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Application>>))]
-    public OneOf<string, Application>? Application { get; init; }
+    public OneOf<string, Application>? Application { get; set; }
 
     /// <summary>
     /// The interview being scored.
     /// </summary>
     [JsonPropertyName("interview")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, ScheduledInterview>>))]
-    public OneOf<string, ScheduledInterview>? Interview { get; init; }
+    public OneOf<string, ScheduledInterview>? Interview { get; set; }
 
     /// <summary>
     /// The interviewer doing the scoring.
     /// </summary>
     [JsonPropertyName("interviewer")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteUser>>))]
-    public OneOf<string, RemoteUser>? Interviewer { get; init; }
+    public OneOf<string, RemoteUser>? Interviewer { get; set; }
 
     /// <summary>
     /// When the third party's scorecard was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the scorecard was submitted.
     /// </summary>
     [JsonPropertyName("submitted_at")]
-    public DateTime? SubmittedAt { get; init; }
+    public DateTime? SubmittedAt { get; set; }
 
     /// <summary>
     /// The inteviewer's recommendation.
@@ -73,17 +72,17 @@ public class Scorecard
     /// - `NO_DECISION` - NO_DECISION
     /// </summary>
     [JsonPropertyName("overall_recommendation")]
-    public OverallRecommendationEnum? OverallRecommendation { get; init; }
+    public OverallRecommendationEnum? OverallRecommendation { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ScreeningQuestion.cs b/src/Merge.Client/Ats/Types/ScreeningQuestion.cs
index af0b30b3..d5293b2f 100644
--- a/src/Merge.Client/Ats/Types/ScreeningQuestion.cs
+++ b/src/Merge.Client/Ats/Types/ScreeningQuestion.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,47 +6,47 @@
 
 namespace Merge.Client.Ats;
 
-public class ScreeningQuestion
+public record ScreeningQuestion
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The job associated with the screening question.
     /// </summary>
     [JsonPropertyName("job")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Job>>))]
-    public OneOf<string, Job>? Job { get; init; }
+    public OneOf<string, Job>? Job { get; set; }
 
     /// <summary>
     /// The description of the screening question
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The title of the screening question
     /// </summary>
     [JsonPropertyName("title")]
-    public string? Title { get; init; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// The data type for the screening question.
@@ -62,20 +61,20 @@ public class ScreeningQuestion
     /// - `BOOLEAN` - BOOLEAN
     /// </summary>
     [JsonPropertyName("type")]
-    public ScreeningQuestionTypeEnum? Type { get; init; }
+    public ScreeningQuestionTypeEnum? Type { get; set; }
 
     /// <summary>
     /// Whether or not the screening question is required.
     /// </summary>
     [JsonPropertyName("required")]
-    public bool? Required { get; init; }
+    public bool? Required { get; set; }
 
     [JsonPropertyName("options")]
-    public IEnumerable<object>? Options { get; init; }
+    public IEnumerable<object>? Options { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ScreeningQuestionAnswer.cs b/src/Merge.Client/Ats/Types/ScreeningQuestionAnswer.cs
index 7e9eb128..7e52c864 100644
--- a/src/Merge.Client/Ats/Types/ScreeningQuestionAnswer.cs
+++ b/src/Merge.Client/Ats/Types/ScreeningQuestionAnswer.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,45 +6,45 @@
 
 namespace Merge.Client.Ats;
 
-public class ScreeningQuestionAnswer
+public record ScreeningQuestionAnswer
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The screening question associated with the candidate’s answer. To determine the data type of the answer, you can expand on the screening question by adding `screening_question_answers.question` to the `expand` query parameter.
     /// </summary>
     [JsonPropertyName("question")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, ScreeningQuestion>>))]
-    public OneOf<string, ScreeningQuestion>? Question { get; init; }
+    public OneOf<string, ScreeningQuestion>? Question { get; set; }
 
     /// <summary>
     /// The candidate’s response to the screening question.
     /// </summary>
     [JsonPropertyName("answer")]
-    public string? Answer { get; init; }
+    public string? Answer { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ScreeningQuestionAnswerRequest.cs b/src/Merge.Client/Ats/Types/ScreeningQuestionAnswerRequest.cs
index d21b304d..850a95e5 100644
--- a/src/Merge.Client/Ats/Types/ScreeningQuestionAnswerRequest.cs
+++ b/src/Merge.Client/Ats/Types/ScreeningQuestionAnswerRequest.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 using OneOf;
 
@@ -7,30 +6,30 @@
 
 namespace Merge.Client.Ats;
 
-public class ScreeningQuestionAnswerRequest
+public record ScreeningQuestionAnswerRequest
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The screening question associated with the candidate’s answer. To determine the data type of the answer, you can expand on the screening question by adding `screening_question_answers.question` to the `expand` query parameter.
     /// </summary>
     [JsonPropertyName("question")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, ScreeningQuestion>>))]
-    public OneOf<string, ScreeningQuestion>? Question { get; init; }
+    public OneOf<string, ScreeningQuestion>? Question { get; set; }
 
     /// <summary>
     /// The candidate’s response to the screening question.
     /// </summary>
     [JsonPropertyName("answer")]
-    public string? Answer { get; init; }
+    public string? Answer { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ScreeningQuestionOption.cs b/src/Merge.Client/Ats/Types/ScreeningQuestionOption.cs
index 23778750..baf9aad9 100644
--- a/src/Merge.Client/Ats/Types/ScreeningQuestionOption.cs
+++ b/src/Merge.Client/Ats/Types/ScreeningQuestionOption.cs
@@ -4,38 +4,38 @@
 
 namespace Merge.Client.Ats;
 
-public class ScreeningQuestionOption
+public record ScreeningQuestionOption
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// Available response options
     /// </summary>
     [JsonPropertyName("label")]
-    public string? Label { get; init; }
+    public string? Label { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/ScreeningQuestionTypeEnum.cs b/src/Merge.Client/Ats/Types/ScreeningQuestionTypeEnum.cs
index a1ccb932..300743d9 100644
--- a/src/Merge.Client/Ats/Types/ScreeningQuestionTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/ScreeningQuestionTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/SelectiveSyncConfigurationsUsageEnum.cs b/src/Merge.Client/Ats/Types/SelectiveSyncConfigurationsUsageEnum.cs
index e058a4fd..41248a15 100644
--- a/src/Merge.Client/Ats/Types/SelectiveSyncConfigurationsUsageEnum.cs
+++ b/src/Merge.Client/Ats/Types/SelectiveSyncConfigurationsUsageEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/SyncStatus.cs b/src/Merge.Client/Ats/Types/SyncStatus.cs
index 7dd47bc7..88bd497d 100644
--- a/src/Merge.Client/Ats/Types/SyncStatus.cs
+++ b/src/Merge.Client/Ats/Types/SyncStatus.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class SyncStatus
+public record SyncStatus
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("last_sync_start")]
-    public DateTime? LastSyncStart { get; init; }
+    public DateTime? LastSyncStart { get; set; }
 
     [JsonPropertyName("next_sync_start")]
-    public DateTime? NextSyncStart { get; init; }
+    public DateTime? NextSyncStart { get; set; }
 
     [JsonPropertyName("status")]
-    public SyncStatusStatusEnum Status { get; init; }
+    public required SyncStatusStatusEnum Status { get; set; }
 
     [JsonPropertyName("is_initial_sync")]
-    public bool IsInitialSync { get; init; }
+    public required bool IsInitialSync { get; set; }
 
     [JsonPropertyName("selective_sync_configurations_usage")]
-    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; init; }
+    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/SyncStatusStatusEnum.cs b/src/Merge.Client/Ats/Types/SyncStatusStatusEnum.cs
index abf175ad..f0c7cf62 100644
--- a/src/Merge.Client/Ats/Types/SyncStatusStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/SyncStatusStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/Tag.cs b/src/Merge.Client/Ats/Types/Tag.cs
index 0f7f7c81..594c70ac 100644
--- a/src/Merge.Client/Ats/Types/Tag.cs
+++ b/src/Merge.Client/Ats/Types/Tag.cs
@@ -4,41 +4,41 @@
 
 namespace Merge.Client.Ats;
 
-public class Tag
+public record Tag
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The tag's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<Dictionary<string, object>>? RemoteData { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/Url.cs b/src/Merge.Client/Ats/Types/Url.cs
index b4d07a8d..4852b612 100644
--- a/src/Merge.Client/Ats/Types/Url.cs
+++ b/src/Merge.Client/Ats/Types/Url.cs
@@ -1,29 +1,28 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class Url
+public record Url
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The site's url.
     /// </summary>
     [JsonPropertyName("value")]
-    public string? Value { get; init; }
+    public string? Value { get; set; }
 
     /// <summary>
     /// The type of site.
@@ -37,11 +36,11 @@ public class Url
     /// - `JOB_POSTING` - JOB_POSTING
     /// </summary>
     [JsonPropertyName("url_type")]
-    public UrlTypeEnum? UrlType { get; init; }
+    public UrlTypeEnum? UrlType { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/UrlRequest.cs b/src/Merge.Client/Ats/Types/UrlRequest.cs
index f646f6e6..4972219f 100644
--- a/src/Merge.Client/Ats/Types/UrlRequest.cs
+++ b/src/Merge.Client/Ats/Types/UrlRequest.cs
@@ -1,17 +1,16 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class UrlRequest
+public record UrlRequest
 {
     /// <summary>
     /// The site's url.
     /// </summary>
     [JsonPropertyName("value")]
-    public string? Value { get; init; }
+    public string? Value { get; set; }
 
     /// <summary>
     /// The type of site.
@@ -25,11 +24,11 @@ public class UrlRequest
     /// - `JOB_POSTING` - JOB_POSTING
     /// </summary>
     [JsonPropertyName("url_type")]
-    public UrlTypeEnum? UrlType { get; init; }
+    public UrlTypeEnum? UrlType { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/UrlTypeEnum.cs b/src/Merge.Client/Ats/Types/UrlTypeEnum.cs
index 6d752851..fc84ce66 100644
--- a/src/Merge.Client/Ats/Types/UrlTypeEnum.cs
+++ b/src/Merge.Client/Ats/Types/UrlTypeEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/ValidationProblemSource.cs b/src/Merge.Client/Ats/Types/ValidationProblemSource.cs
index 4b349ec5..dba53c61 100644
--- a/src/Merge.Client/Ats/Types/ValidationProblemSource.cs
+++ b/src/Merge.Client/Ats/Types/ValidationProblemSource.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Ats;
 
-public class ValidationProblemSource
+public record ValidationProblemSource
 {
     [JsonPropertyName("pointer")]
-    public string Pointer { get; init; }
+    public required string Pointer { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/VeteranStatusEnum.cs b/src/Merge.Client/Ats/Types/VeteranStatusEnum.cs
index 8d11ee3b..891c0c9e 100644
--- a/src/Merge.Client/Ats/Types/VeteranStatusEnum.cs
+++ b/src/Merge.Client/Ats/Types/VeteranStatusEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/VisibilityEnum.cs b/src/Merge.Client/Ats/Types/VisibilityEnum.cs
index 854fe1bd..c525482b 100644
--- a/src/Merge.Client/Ats/Types/VisibilityEnum.cs
+++ b/src/Merge.Client/Ats/Types/VisibilityEnum.cs
@@ -1,6 +1,5 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 using Merge.Client.Core;
 
 #nullable enable
diff --git a/src/Merge.Client/Ats/Types/WarningValidationProblem.cs b/src/Merge.Client/Ats/Types/WarningValidationProblem.cs
index e676d718..03f18161 100644
--- a/src/Merge.Client/Ats/Types/WarningValidationProblem.cs
+++ b/src/Merge.Client/Ats/Types/WarningValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ats;
 
 #nullable enable
 
 namespace Merge.Client.Ats;
 
-public class WarningValidationProblem
+public record WarningValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Types/WebhookReceiver.cs b/src/Merge.Client/Ats/Types/WebhookReceiver.cs
index d1a10912..cb49872a 100644
--- a/src/Merge.Client/Ats/Types/WebhookReceiver.cs
+++ b/src/Merge.Client/Ats/Types/WebhookReceiver.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ats;
 
-public class WebhookReceiver
+public record WebhookReceiver
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Users/Requests/UsersListRequest.cs b/src/Merge.Client/Ats/Users/Requests/UsersListRequest.cs
index 86d40c43..95e95b08 100644
--- a/src/Merge.Client/Ats/Users/Requests/UsersListRequest.cs
+++ b/src/Merge.Client/Ats/Users/Requests/UsersListRequest.cs
@@ -1,64 +1,64 @@
 namespace Merge.Client.Ats;
 
-public class UsersListRequest
+public record UsersListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return remote users with the given email address
     /// </summary>
-    public string? Email { get; init; }
+    public string? Email { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Users/Requests/UsersRetrieveRequest.cs b/src/Merge.Client/Ats/Users/Requests/UsersRetrieveRequest.cs
index 581b79e2..3e21876e 100644
--- a/src/Merge.Client/Ats/Users/Requests/UsersRetrieveRequest.cs
+++ b/src/Merge.Client/Ats/Users/Requests/UsersRetrieveRequest.cs
@@ -1,19 +1,19 @@
 namespace Merge.Client.Ats;
 
-public class UsersRetrieveRequest
+public record UsersRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ats/Users/UsersClient.cs b/src/Merge.Client/Ats/Users/UsersClient.cs
index 746527ec..46dccbb0 100644
--- a/src/Merge.Client/Ats/Users/UsersClient.cs
+++ b/src/Merge.Client/Ats/Users/UsersClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public UsersClient(RawClient client)
     /// <summary>
     /// Returns a list of `RemoteUser` objects.
     /// </summary>
-    public async Task<PaginatedRemoteUserList> ListAsync(UsersListRequest request)
+    public async Task<PaginatedRemoteUserList> ListAsync(
+        UsersListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedRemoteUserList> ListAsync(UsersListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -72,23 +81,41 @@ public async Task<PaginatedRemoteUserList> ListAsync(UsersListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ats/v1/users",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteUserList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteUserList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `RemoteUser` object with the given `id`.
     /// </summary>
-    public async Task<RemoteUser> RetrieveAsync(string id, UsersRetrieveRequest request)
+    public async Task<RemoteUser> RetrieveAsync(
+        string id,
+        UsersRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -106,16 +133,30 @@ public async Task<RemoteUser> RetrieveAsync(string id, UsersRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ats/v1/users/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteUser>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteUser>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ats/WebhookReceivers/Requests/WebhookReceiverRequest.cs b/src/Merge.Client/Ats/WebhookReceivers/Requests/WebhookReceiverRequest.cs
index c92dd987..bbfc85de 100644
--- a/src/Merge.Client/Ats/WebhookReceivers/Requests/WebhookReceiverRequest.cs
+++ b/src/Merge.Client/Ats/WebhookReceivers/Requests/WebhookReceiverRequest.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ats;
 
-public class WebhookReceiverRequest
+public record WebhookReceiverRequest
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Ats/WebhookReceivers/WebhookReceiversClient.cs b/src/Merge.Client/Ats/WebhookReceivers/WebhookReceiversClient.cs
index 1c8cb206..c5da7b1e 100644
--- a/src/Merge.Client/Ats/WebhookReceivers/WebhookReceiversClient.cs
+++ b/src/Merge.Client/Ats/WebhookReceivers/WebhookReceiversClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ats;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,72 @@ public WebhookReceiversClient(RawClient client)
     /// <summary>
     /// Returns a list of `WebhookReceiver` objects.
     /// </summary>
-    public async Task<IEnumerable<WebhookReceiver>> ListAsync()
+    public async Task<IEnumerable<WebhookReceiver>> ListAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ats/v1/webhook-receivers"
+                Path = "ats/v1/webhook-receivers",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<WebhookReceiver>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<WebhookReceiver>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `WebhookReceiver` object with the given values.
     /// </summary>
-    public async Task<WebhookReceiver> CreateAsync(WebhookReceiverRequest request)
+    public async Task<WebhookReceiver> CreateAsync(
+        WebhookReceiverRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ats/v1/webhook-receivers",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<WebhookReceiver>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<WebhookReceiver>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Core/ClientOptions.cs b/src/Merge.Client/Core/ClientOptions.cs
index f4be4468..d813dd6f 100644
--- a/src/Merge.Client/Core/ClientOptions.cs
+++ b/src/Merge.Client/Core/ClientOptions.cs
@@ -1,15 +1,16 @@
-using Merge.Client.Core;
+using System;
+using System.Net.Http;
 
 #nullable enable
 
-namespace Merge.Client;
+namespace Merge.Client.Core;
 
 public partial class ClientOptions
 {
     /// <summary>
     /// The Base URL for the API.
     /// </summary>
-    public string BaseUrl { get; init; } = Environments.PRODUCTION;
+    public string BaseUrl { get; init; } = MergeEnvironment.PRODUCTION;
 
     /// <summary>
     /// The http client used to make requests.
@@ -22,7 +23,7 @@ public partial class ClientOptions
     public int MaxRetries { get; init; } = 2;
 
     /// <summary>
-    /// The timeout for the request in seconds.
+    /// The timeout for the request.
     /// </summary>
-    public int TimeoutInSeconds { get; init; } = 30;
+    public TimeSpan Timeout { get; init; } = TimeSpan.FromSeconds(30);
 }
diff --git a/src/Merge.Client/Core/CollectionItemSerializer.cs b/src/Merge.Client/Core/CollectionItemSerializer.cs
index da8ead79..bce5fd22 100644
--- a/src/Merge.Client/Core/CollectionItemSerializer.cs
+++ b/src/Merge.Client/Core/CollectionItemSerializer.cs
@@ -3,7 +3,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Merge.Client;
+namespace Merge.Client.Core;
 
 /// <summary>
 /// Json collection converter.
@@ -21,35 +21,34 @@ public class CollectionItemSerializer<TDatatype, TConverterType>
     /// <param name="typeToConvert">Type to convert.</param>
     /// <param name="options">Serializer options.</param>
     /// <returns>Created object.</returns>
-    public override IEnumerable<TDatatype> Read(
+    public override IEnumerable<TDatatype>? Read(
         ref Utf8JsonReader reader,
-        Type typeToConvert,
+        System.Type typeToConvert,
         JsonSerializerOptions options
     )
     {
         if (reader.TokenType == JsonTokenType.Null)
         {
-            return default(IEnumerable<TDatatype>);
+            return default;
         }
 
-        JsonSerializerOptions jsonSerializerOptions = new JsonSerializerOptions(options);
+        var jsonSerializerOptions = new JsonSerializerOptions(options);
         jsonSerializerOptions.Converters.Clear();
         jsonSerializerOptions.Converters.Add(Activator.CreateInstance<TConverterType>());
 
-        List<TDatatype> returnValue = new List<TDatatype>();
+        var returnValue = new List<TDatatype>();
 
         while (reader.TokenType != JsonTokenType.EndArray)
         {
             if (reader.TokenType != JsonTokenType.StartArray)
             {
-                returnValue.Add(
-                    (TDatatype)
-                        JsonSerializer.Deserialize(
-                            ref reader,
-                            typeof(TDatatype),
-                            jsonSerializerOptions
-                        )
+                var item = (TDatatype)(
+                    JsonSerializer.Deserialize(ref reader, typeof(TDatatype), jsonSerializerOptions)
+                    ?? throw new Exception(
+                        $"Failed to deserialize collection item of type {typeof(TDatatype)}"
+                    )
                 );
+                returnValue.Add(item);
             }
 
             reader.Read();
@@ -66,7 +65,7 @@ JsonSerializerOptions options
     /// <param name="options">Serializer options.</param>
     public override void Write(
         Utf8JsonWriter writer,
-        IEnumerable<TDatatype> value,
+        IEnumerable<TDatatype>? value,
         JsonSerializerOptions options
     )
     {
@@ -82,7 +81,7 @@ JsonSerializerOptions options
 
         writer.WriteStartArray();
 
-        foreach (TDatatype data in value)
+        foreach (var data in value)
         {
             JsonSerializer.Serialize(writer, data, jsonSerializerOptions);
         }
diff --git a/src/Merge.Client/Core/Constants.cs b/src/Merge.Client/Core/Constants.cs
new file mode 100644
index 00000000..c3fc1915
--- /dev/null
+++ b/src/Merge.Client/Core/Constants.cs
@@ -0,0 +1,6 @@
+namespace Merge.Client.Core;
+
+public static class Constants
+{
+    public const string DateTimeFormat = "yyyy'-'MM'-'dd'T'HH':'mm':'ss.fffK";
+}
diff --git a/src/Merge.Client/Core/DateTimeSerializer.cs b/src/Merge.Client/Core/DateTimeSerializer.cs
new file mode 100644
index 00000000..951a4547
--- /dev/null
+++ b/src/Merge.Client/Core/DateTimeSerializer.cs
@@ -0,0 +1,22 @@
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Merge.Client.Core;
+
+public class DateTimeSerializer : JsonConverter<DateTime>
+{
+    public override DateTime Read(
+        ref Utf8JsonReader reader,
+        System.Type typeToConvert,
+        JsonSerializerOptions options
+    )
+    {
+        return DateTime.Parse(reader.GetString()!, null, DateTimeStyles.RoundtripKind);
+    }
+
+    public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString(Constants.DateTimeFormat));
+    }
+}
diff --git a/src/Merge.Client/Core/HttpMethodExtensions.cs b/src/Merge.Client/Core/HttpMethodExtensions.cs
new file mode 100644
index 00000000..6226a13d
--- /dev/null
+++ b/src/Merge.Client/Core/HttpMethodExtensions.cs
@@ -0,0 +1,8 @@
+using System.Net.Http;
+
+namespace Merge.Client.Core;
+
+public static class HttpMethodExtensions
+{
+    public static readonly HttpMethod Patch = new("PATCH");
+}
diff --git a/src/Merge.Client/Core/JsonConfiguration.cs b/src/Merge.Client/Core/JsonConfiguration.cs
new file mode 100644
index 00000000..60dbec04
--- /dev/null
+++ b/src/Merge.Client/Core/JsonConfiguration.cs
@@ -0,0 +1,30 @@
+using System.Text.Json;
+
+namespace Merge.Client.Core;
+
+public static class JsonOptions
+{
+    public static readonly JsonSerializerOptions JsonSerializerOptions;
+
+    static JsonOptions()
+    {
+        JsonSerializerOptions = new JsonSerializerOptions
+        {
+            Converters = { new DateTimeSerializer() },
+            WriteIndented = true
+        };
+    }
+}
+
+public static class JsonUtils
+{
+    public static string Serialize<T>(T obj)
+    {
+        return JsonSerializer.Serialize(obj, JsonOptions.JsonSerializerOptions);
+    }
+
+    public static T Deserialize<T>(string json)
+    {
+        return JsonSerializer.Deserialize<T>(json, JsonOptions.JsonSerializerOptions)!;
+    }
+}
diff --git a/src/Merge.Client/Core/MergeApiException.cs b/src/Merge.Client/Core/MergeApiException.cs
new file mode 100644
index 00000000..02050b60
--- /dev/null
+++ b/src/Merge.Client/Core/MergeApiException.cs
@@ -0,0 +1,23 @@
+namespace Merge.Client.Core;
+
+/// <summary>
+/// This exception type will be thrown for any non-2XX API responses.
+/// </summary>
+public class MergeApiException(string message, int statusCode, object body)
+    : MergeException(message)
+{
+    /// <summary>
+    /// The error code of the response that triggered the exception.
+    /// </summary>
+    public int StatusCode { get; } = statusCode;
+
+    /// <summary>
+    /// The body of the response that triggered the exception.
+    /// </summary>
+    public object Body { get; } = body;
+
+    public override string ToString()
+    {
+        return $"MergeApiException {{ message: {Message}, statusCode: {StatusCode}, body: {Body} }}";
+    }
+}
diff --git a/src/Merge.Client/Core/Environments.cs b/src/Merge.Client/Core/MergeEnvironment.cs
similarity index 89%
rename from src/Merge.Client/Core/Environments.cs
rename to src/Merge.Client/Core/MergeEnvironment.cs
index 65c83b3f..1d361bf7 100644
--- a/src/Merge.Client/Core/Environments.cs
+++ b/src/Merge.Client/Core/MergeEnvironment.cs
@@ -1,6 +1,6 @@
 namespace Merge.Client.Core;
 
-public class Environments
+public class MergeEnvironment
 {
     public static string PRODUCTION = "https://api.merge.dev/api";
 
diff --git a/src/Merge.Client/Core/MergeException.cs b/src/Merge.Client/Core/MergeException.cs
new file mode 100644
index 00000000..6f1c2925
--- /dev/null
+++ b/src/Merge.Client/Core/MergeException.cs
@@ -0,0 +1,11 @@
+using System;
+
+#nullable enable
+
+namespace Merge.Client.Core;
+
+/// <summary>
+/// Base exception class for all exceptions thrown by the SDK.
+/// </summary>
+public class MergeException(string message, Exception? innerException = null)
+    : Exception(message, innerException) { }
diff --git a/src/Merge.Client/Core/OneOfSerializer.cs b/src/Merge.Client/Core/OneOfSerializer.cs
index 8348cc62..e361874f 100644
--- a/src/Merge.Client/Core/OneOfSerializer.cs
+++ b/src/Merge.Client/Core/OneOfSerializer.cs
@@ -3,14 +3,14 @@
 using System.Text.Json.Serialization;
 using OneOf;
 
-namespace Merge.Client;
+namespace Merge.Client.Core;
 
 public class OneOfSerializer<TOneOf> : JsonConverter<TOneOf>
     where TOneOf : IOneOf
 {
-    public override TOneOf Read(
+    public override TOneOf? Read(
         ref Utf8JsonReader reader,
-        Type typeToConvert,
+        System.Type typeToConvert,
         JsonSerializerOptions options
     )
     {
@@ -21,10 +21,10 @@ JsonSerializerOptions options
         {
             try
             {
-                Utf8JsonReader readerCopy = reader;
+                var readerCopy = reader;
                 var result = JsonSerializer.Deserialize(ref readerCopy, type, options);
                 reader.Skip();
-                return (TOneOf)cast.Invoke(null, new[] { result })!;
+                return (TOneOf)cast.Invoke(null, [result])!;
             }
             catch (JsonException) { }
         }
@@ -34,14 +34,14 @@ JsonSerializerOptions options
         );
     }
 
-    private static readonly (Type type, MethodInfo cast)[] s_types = GetOneOfTypes();
+    private static readonly (System.Type type, MethodInfo cast)[] s_types = GetOneOfTypes();
 
     public override void Write(Utf8JsonWriter writer, TOneOf value, JsonSerializerOptions options)
     {
         JsonSerializer.Serialize(writer, value.Value, options);
     }
 
-    private static (Type type, MethodInfo cast)[] GetOneOfTypes()
+    private static (System.Type type, MethodInfo cast)[] GetOneOfTypes()
     {
         var casts = typeof(TOneOf)
             .GetRuntimeMethods()
diff --git a/src/Merge.Client/Core/RawClient.cs b/src/Merge.Client/Core/RawClient.cs
index bd0e2e00..82d97b2f 100644
--- a/src/Merge.Client/Core/RawClient.cs
+++ b/src/Merge.Client/Core/RawClient.cs
@@ -1,143 +1,149 @@
+using System.Net.Http;
 using System.Text;
-using System.Text.Json;
 
-namespace Merge.Client;
+namespace Merge.Client.Core;
 
 #nullable enable
 
 /// <summary>
 /// Utility class for making raw HTTP requests to the API.
 /// </summary>
-public class RawClient
+public class RawClient(
+    Dictionary<string, string> headers,
+    Dictionary<string, Func<string>> headerSuppliers,
+    ClientOptions clientOptions
+)
 {
     /// <summary>
     /// The http client used to make requests.
     /// </summary>
-    private readonly ClientOptions _clientOptions;
+    public readonly ClientOptions Options = clientOptions;
 
     /// <summary>
     /// Global headers to be sent with every request.
     /// </summary>
-    private readonly Dictionary<String, String> _headers;
-
-    public RawClient(Dictionary<String, String> headers, ClientOptions clientOptions)
-    {
-        _clientOptions = clientOptions;
-        _headers = headers;
-    }
+    private readonly Dictionary<string, string> _headers = headers;
 
     public async Task<ApiResponse> MakeRequestAsync(BaseApiRequest request)
     {
-        var url = this.BuildUrl(request.Path, request.Query);
+        var url = BuildUrl(request);
         var httpRequest = new HttpRequestMessage(request.Method, url);
         if (request.ContentType != null)
         {
             request.Headers.Add("Content-Type", request.ContentType);
         }
         // Add global headers to the request
-        foreach (var (key, value) in _headers)
+        foreach (var header in _headers)
+        {
+            httpRequest.Headers.Add(header.Key, header.Value);
+        }
+        // Add global headers to the request from supplier
+        foreach (var header in headerSuppliers)
         {
-            httpRequest.Headers.Add(key, value);
+            httpRequest.Headers.Add(header.Key, header.Value.Invoke());
         }
         // Add request headers to the request
-        foreach (var (key, value) in request.Headers)
+        foreach (var header in request.Headers)
         {
-            httpRequest.Headers.Add(key, value);
+            httpRequest.Headers.Add(header.Key, header.Value);
         }
         // Add the request body to the request
         if (request is JsonApiRequest jsonRequest)
         {
             if (jsonRequest.Body != null)
             {
-                var serializerOptions = new JsonSerializerOptions { WriteIndented = true, };
                 httpRequest.Content = new StringContent(
-                    JsonSerializer.Serialize(jsonRequest.Body, serializerOptions),
+                    JsonUtils.Serialize(jsonRequest.Body),
                     Encoding.UTF8,
                     "application/json"
                 );
             }
         }
-        else if (request is StreamApiRequest streamRequest)
+        else if (request is StreamApiRequest { Body: not null } streamRequest)
         {
-            if (streamRequest.Body != null)
-            {
-                httpRequest.Content = new StreamContent(streamRequest.Body);
-            }
+            httpRequest.Content = new StreamContent(streamRequest.Body);
         }
         // Send the request
-        HttpResponseMessage response = await _clientOptions.HttpClient.SendAsync(httpRequest);
+        var httpClient = request.Options?.HttpClient ?? Options.HttpClient;
+        var response = await httpClient.SendAsync(httpRequest);
         return new ApiResponse { StatusCode = (int)response.StatusCode, Raw = response };
     }
 
-    public abstract class BaseApiRequest
+    public record BaseApiRequest
     {
-        public HttpMethod Method;
+        public required string BaseUrl { get; init; }
 
-        public string Path;
+        public required HttpMethod Method { get; init; }
 
-        public string? ContentType = null;
+        public required string Path { get; init; }
+
+        public string? ContentType { get; init; }
 
         public Dictionary<string, object> Query { get; init; } = new();
 
         public Dictionary<string, string> Headers { get; init; } = new();
 
-        public object RequestOptions { get; init; }
+        public RequestOptions? Options { get; init; }
     }
 
     /// <summary>
     /// The request object to be sent for streaming uploads.
     /// </summary>
-    public class StreamApiRequest : BaseApiRequest
+    public record StreamApiRequest : BaseApiRequest
     {
-        public Stream? Body { get; init; } = null;
+        public Stream? Body { get; init; }
     }
 
     /// <summary>
     /// The request object to be sent for JSON APIs.
     /// </summary>
-    public class JsonApiRequest : BaseApiRequest
+    public record JsonApiRequest : BaseApiRequest
     {
-        public object? Body { get; init; } = null;
+        public object? Body { get; init; }
     }
 
     /// <summary>
     /// The response object returned from the API.
     /// </summary>
-    public class ApiResponse
+    public record ApiResponse
     {
-        public int StatusCode;
+        public required int StatusCode { get; init; }
 
-        public HttpResponseMessage Raw;
+        public required HttpResponseMessage Raw { get; init; }
     }
 
-    private Dictionary<string, string> GetHeaders(BaseApiRequest request)
+    private string BuildUrl(BaseApiRequest request)
     {
-        var headers = new Dictionary<string, string>();
-        foreach (var (key, value) in request.Headers)
-        {
-            headers.Add(key, value);
-        }
-        foreach (var (key, value) in _headers)
-        {
-            headers.Add(key, value);
-        }
-        return headers;
-    }
-
-    public string BuildUrl(string path, Dictionary<string, object> query)
-    {
-        var trimmedBaseUrl = _clientOptions.BaseUrl.TrimEnd('/');
-        var trimmedBasePath = path.TrimStart('/');
+        var baseUrl = request.Options?.BaseUrl ?? request.BaseUrl;
+        var trimmedBaseUrl = baseUrl.TrimEnd('/');
+        var trimmedBasePath = request.Path.TrimStart('/');
         var url = $"{trimmedBaseUrl}/{trimmedBasePath}";
-        if (query.Count > 0)
-        {
-            url += "?";
-            foreach (var (key, value) in query)
+        if (request.Query.Count <= 0)
+            return url;
+        url += "?";
+        url = request.Query.Aggregate(
+            url,
+            (current, queryItem) =>
             {
-                url += $"{key}={value}&";
+                if (queryItem.Value is System.Collections.IEnumerable collection and not string)
+                {
+                    var items = collection
+                        .Cast<object>()
+                        .Select(value => $"{queryItem.Key}={value}")
+                        .ToList();
+                    if (items.Any())
+                    {
+                        current += string.Join("&", items) + "&";
+                    }
+                }
+                else
+                {
+                    current += $"{queryItem.Key}={queryItem.Value}&";
+                }
+                return current;
             }
-            url = url.Substring(0, url.Length - 1);
-        }
+        );
+        url = url.Substring(0, url.Length - 1);
         return url;
     }
 }
diff --git a/src/Merge.Client/Core/RequestOptions.cs b/src/Merge.Client/Core/RequestOptions.cs
new file mode 100644
index 00000000..41bf550d
--- /dev/null
+++ b/src/Merge.Client/Core/RequestOptions.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Net.Http;
+
+#nullable enable
+
+namespace Merge.Client.Core;
+
+public partial class RequestOptions
+{
+    /// <summary>
+    /// The Base URL for the API.
+    /// </summary>
+    public string? BaseUrl { get; init; }
+
+    /// <summary>
+    /// The http client used to make requests.
+    /// </summary>
+    public HttpClient? HttpClient { get; init; }
+
+    /// <summary>
+    /// The http client used to make requests.
+    /// </summary>
+    public int? MaxRetries { get; init; }
+
+    /// <summary>
+    /// The timeout for the request.
+    /// </summary>
+    public TimeSpan? Timeout { get; init; }
+}
diff --git a/src/Merge.Client/Core/StringEnumSerializer.cs b/src/Merge.Client/Core/StringEnumSerializer.cs
index 1e8e72e1..5a7f7e6b 100644
--- a/src/Merge.Client/Core/StringEnumSerializer.cs
+++ b/src/Merge.Client/Core/StringEnumSerializer.cs
@@ -2,55 +2,48 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Merge.Client;
+namespace Merge.Client.Core;
 
 public class StringEnumSerializer<TEnum> : JsonConverter<TEnum>
     where TEnum : struct, System.Enum
 {
-    private readonly Dictionary<TEnum, string> _enumToString = new Dictionary<TEnum, string>();
-    private readonly Dictionary<string, TEnum> _stringToEnum = new Dictionary<string, TEnum>();
+    private readonly Dictionary<TEnum, string> _enumToString = new();
+    private readonly Dictionary<string, TEnum> _stringToEnum = new();
 
     public StringEnumSerializer()
     {
         var type = typeof(TEnum);
-        var values = System.Enum.GetValues<TEnum>();
+        var values = Enum.GetValues(type);
 
         foreach (var value in values)
         {
-            var enumMember = type.GetMember(value.ToString())[0];
+            var enumValue = (TEnum)value;
+            var enumMember = type.GetMember(enumValue.ToString())[0];
             var attr = enumMember
                 .GetCustomAttributes(typeof(EnumMemberAttribute), false)
                 .Cast<EnumMemberAttribute>()
                 .FirstOrDefault();
 
-            _stringToEnum.Add(value.ToString(), value);
-
-            if (attr?.Value != null)
-            {
-                _enumToString.Add(value, attr.Value);
-                _stringToEnum.Add(attr.Value, value);
-            }
-            else
-            {
-                _enumToString.Add(value, value.ToString());
-            }
+            var stringValue =
+                attr?.Value
+                ?? value.ToString()
+                ?? throw new Exception("Unexpected null enum toString value");
+
+            _enumToString.Add(enumValue, stringValue);
+            _stringToEnum.Add(stringValue, enumValue);
         }
     }
 
     public override TEnum Read(
         ref Utf8JsonReader reader,
-        Type typeToConvert,
+        System.Type typeToConvert,
         JsonSerializerOptions options
     )
     {
-        var stringValue = reader.GetString();
-
-        if (_stringToEnum.TryGetValue(stringValue, out var enumValue))
-        {
-            return enumValue;
-        }
-
-        return default;
+        var stringValue =
+            reader.GetString()
+            ?? throw new Exception("The JSON value could not be read as a string.");
+        return _stringToEnum.TryGetValue(stringValue, out var enumValue) ? enumValue : default;
     }
 
     public override void Write(Utf8JsonWriter writer, TEnum value, JsonSerializerOptions options)
diff --git a/src/Merge.Client/Crm/AccountDetails/AccountDetailsClient.cs b/src/Merge.Client/Crm/AccountDetails/AccountDetailsClient.cs
index 88678902..b5febfdd 100644
--- a/src/Merge.Client/Crm/AccountDetails/AccountDetailsClient.cs
+++ b/src/Merge.Client/Crm/AccountDetails/AccountDetailsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AccountDetailsClient(RawClient client)
     /// <summary>
     /// Get details for a linked account.
     /// </summary>
-    public async Task<AccountDetails> RetrieveAsync()
+    public async Task<AccountDetails> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/account-details"
+                Path = "crm/v1/account-details",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountDetails>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountDetails>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/AccountToken/AccountTokenClient.cs b/src/Merge.Client/Crm/AccountToken/AccountTokenClient.cs
index fb8cd263..7ade166d 100644
--- a/src/Merge.Client/Crm/AccountToken/AccountTokenClient.cs
+++ b/src/Merge.Client/Crm/AccountToken/AccountTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,37 @@ public AccountTokenClient(RawClient client)
     /// <summary>
     /// Returns the account token for the end user with the provided public token.
     /// </summary>
-    public async Task<AccountToken> RetrieveAsync(string publicToken)
+    public async Task<AccountToken> RetrieveAsync(
+        string publicToken,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"crm/v1/account-token/{publicToken}"
+                Path = $"crm/v1/account-token/{publicToken}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Accounts/AccountsClient.cs b/src/Merge.Client/Crm/Accounts/AccountsClient.cs
index c5fac7a2..39ab9075 100644
--- a/src/Merge.Client/Crm/Accounts/AccountsClient.cs
+++ b/src/Merge.Client/Crm/Accounts/AccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public AccountsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Account` objects.
     /// </summary>
-    public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
+    public async Task<PaginatedAccountList> ListAsync(
+        AccountsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Name != null)
         {
@@ -76,23 +85,40 @@ public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Account` object with the given values.
     /// </summary>
-    public async Task<CrmAccountResponse> CreateAsync(CrmAccountEndpointRequest request)
+    public async Task<CrmAccountResponse> CreateAsync(
+        CrmAccountEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -106,23 +132,41 @@ public async Task<CrmAccountResponse> CreateAsync(CrmAccountEndpointRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CrmAccountResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CrmAccountResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Account` object with the given `id`.
     /// </summary>
-    public async Task<Account> RetrieveAsync(string id, AccountsRetrieveRequest request)
+    public async Task<Account> RetrieveAsync(
+        string id,
+        AccountsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -140,17 +184,31 @@ public async Task<Account> RetrieveAsync(string id, AccountsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/accounts/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Account>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Account>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -158,7 +216,8 @@ public async Task<Account> RetrieveAsync(string id, AccountsRetrieveRequest requ
     /// </summary>
     public async Task<CrmAccountResponse> PartialUpdateAsync(
         string id,
-        PatchedCrmAccountEndpointRequest request
+        PatchedCrmAccountEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -173,64 +232,110 @@ PatchedCrmAccountEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"crm/v1/accounts/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CrmAccountResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CrmAccountResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `CRMAccount` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"crm/v1/accounts/meta/patch/{id}"
+                Path = $"crm/v1/accounts/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `CRMAccount` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/accounts/meta/post"
+                Path = "crm/v1/accounts/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        AccountsRemoteFieldClassesListRequest request
+        AccountsRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -261,16 +366,30 @@ AccountsRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/accounts/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Accounts/Requests/AccountsListRequest.cs b/src/Merge.Client/Crm/Accounts/Requests/AccountsListRequest.cs
index cf06caa4..76e9804b 100644
--- a/src/Merge.Client/Crm/Accounts/Requests/AccountsListRequest.cs
+++ b/src/Merge.Client/Crm/Accounts/Requests/AccountsListRequest.cs
@@ -1,69 +1,69 @@
 namespace Merge.Client.Crm;
 
-public class AccountsListRequest
+public record AccountsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return accounts with this name.
     /// </summary>
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// If provided, will only return accounts with this owner.
     /// </summary>
-    public string? OwnerId { get; init; }
+    public string? OwnerId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Accounts/Requests/AccountsRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Accounts/Requests/AccountsRemoteFieldClassesListRequest.cs
index fc7ad298..4795472b 100644
--- a/src/Merge.Client/Crm/Accounts/Requests/AccountsRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Accounts/Requests/AccountsRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class AccountsRemoteFieldClassesListRequest
+public record AccountsRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Accounts/Requests/AccountsRetrieveRequest.cs b/src/Merge.Client/Crm/Accounts/Requests/AccountsRetrieveRequest.cs
index 70bf5d67..f879a41a 100644
--- a/src/Merge.Client/Crm/Accounts/Requests/AccountsRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Accounts/Requests/AccountsRetrieveRequest.cs
@@ -1,19 +1,19 @@
 namespace Merge.Client.Crm;
 
-public class AccountsRetrieveRequest
+public record AccountsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Accounts/Requests/CrmAccountEndpointRequest.cs b/src/Merge.Client/Crm/Accounts/Requests/CrmAccountEndpointRequest.cs
index 95f5b9bf..44e0e722 100644
--- a/src/Merge.Client/Crm/Accounts/Requests/CrmAccountEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Accounts/Requests/CrmAccountEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class CrmAccountEndpointRequest
+public record CrmAccountEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public AccountRequest Model { get; init; }
+    public required AccountRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Accounts/Requests/PatchedCrmAccountEndpointRequest.cs b/src/Merge.Client/Crm/Accounts/Requests/PatchedCrmAccountEndpointRequest.cs
index 1adb37e1..de98f9bc 100644
--- a/src/Merge.Client/Crm/Accounts/Requests/PatchedCrmAccountEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Accounts/Requests/PatchedCrmAccountEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class PatchedCrmAccountEndpointRequest
+public record PatchedCrmAccountEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PatchedAccountRequest Model { get; init; }
+    public required PatchedAccountRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/AssociationTypes/AssociationTypesClient.cs b/src/Merge.Client/Crm/AssociationTypes/AssociationTypesClient.cs
index 147b43ab..efa5b8de 100644
--- a/src/Merge.Client/Crm/AssociationTypes/AssociationTypesClient.cs
+++ b/src/Merge.Client/Crm/AssociationTypes/AssociationTypesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -20,17 +20,20 @@ public AssociationTypesClient(RawClient client)
     /// </summary>
     public async Task<PaginatedAssociationTypeList> CustomObjectClassesAssociationTypesListAsync(
         string customObjectClassId,
-        CustomObjectClassesAssociationTypesListRequest request
+        CustomObjectClassesAssociationTypesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -50,11 +53,15 @@ CustomObjectClassesAssociationTypesListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -67,17 +74,31 @@ CustomObjectClassesAssociationTypesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/custom-object-classes/{customObjectClassId}/association-types",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAssociationTypeList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAssociationTypeList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -85,7 +106,8 @@ CustomObjectClassesAssociationTypesListRequest request
     /// </summary>
     public async Task<CrmAssociationTypeResponse> CustomObjectClassesAssociationTypesCreateAsync(
         string customObjectClassId,
-        CrmAssociationTypeEndpointRequest request
+        CrmAssociationTypeEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -100,17 +122,31 @@ CrmAssociationTypeEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = $"crm/v1/custom-object-classes/{customObjectClassId}/association-types",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CrmAssociationTypeResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CrmAssociationTypeResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -119,7 +155,8 @@ CrmAssociationTypeEndpointRequest request
     public async Task<AssociationType> CustomObjectClassesAssociationTypesRetrieveAsync(
         string customObjectClassId,
         string id,
-        CustomObjectClassesAssociationTypesRetrieveRequest request
+        CustomObjectClassesAssociationTypesRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -134,39 +171,68 @@ CustomObjectClassesAssociationTypesRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/custom-object-classes/{customObjectClassId}/association-types/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AssociationType>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AssociationType>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `CRMAssociationType` POSTs.
     /// </summary>
     public async Task<MetaResponse> CustomObjectClassesAssociationTypesMetaPostRetrieveAsync(
-        string customObjectClassId
+        string customObjectClassId,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path =
-                    $"crm/v1/custom-object-classes/{customObjectClassId}/association-types/meta/post"
+                    $"crm/v1/custom-object-classes/{customObjectClassId}/association-types/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/AssociationTypes/Requests/CrmAssociationTypeEndpointRequest.cs b/src/Merge.Client/Crm/AssociationTypes/Requests/CrmAssociationTypeEndpointRequest.cs
index b76e6980..26c5b438 100644
--- a/src/Merge.Client/Crm/AssociationTypes/Requests/CrmAssociationTypeEndpointRequest.cs
+++ b/src/Merge.Client/Crm/AssociationTypes/Requests/CrmAssociationTypeEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class CrmAssociationTypeEndpointRequest
+public record CrmAssociationTypeEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public AssociationTypeRequestRequest Model { get; init; }
+    public required AssociationTypeRequestRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/AssociationTypes/Requests/CustomObjectClassesAssociationTypesListRequest.cs b/src/Merge.Client/Crm/AssociationTypes/Requests/CustomObjectClassesAssociationTypesListRequest.cs
index 0f2f6391..0e2f2d87 100644
--- a/src/Merge.Client/Crm/AssociationTypes/Requests/CustomObjectClassesAssociationTypesListRequest.cs
+++ b/src/Merge.Client/Crm/AssociationTypes/Requests/CustomObjectClassesAssociationTypesListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesAssociationTypesListRequest
+public record CustomObjectClassesAssociationTypesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/AssociationTypes/Requests/CustomObjectClassesAssociationTypesRetrieveRequest.cs b/src/Merge.Client/Crm/AssociationTypes/Requests/CustomObjectClassesAssociationTypesRetrieveRequest.cs
index 4880361b..42310325 100644
--- a/src/Merge.Client/Crm/AssociationTypes/Requests/CustomObjectClassesAssociationTypesRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/AssociationTypes/Requests/CustomObjectClassesAssociationTypesRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesAssociationTypesRetrieveRequest
+public record CustomObjectClassesAssociationTypesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Associations/AssociationsClient.cs b/src/Merge.Client/Crm/Associations/AssociationsClient.cs
index 4800ffd2..f333c69b 100644
--- a/src/Merge.Client/Crm/Associations/AssociationsClient.cs
+++ b/src/Merge.Client/Crm/Associations/AssociationsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -21,7 +21,8 @@ public AssociationsClient(RawClient client)
     public async Task<PaginatedAssociationList> CustomObjectClassesCustomObjectsAssociationsListAsync(
         string customObjectClassId,
         string objectId,
-        CustomObjectClassesCustomObjectsAssociationsListRequest request
+        CustomObjectClassesCustomObjectsAssociationsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -31,11 +32,13 @@ CustomObjectClassesCustomObjectsAssociationsListRequest request
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -55,11 +58,15 @@ CustomObjectClassesCustomObjectsAssociationsListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -72,18 +79,32 @@ CustomObjectClassesCustomObjectsAssociationsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path =
                     $"crm/v1/custom-object-classes/{customObjectClassId}/custom-objects/{objectId}/associations",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAssociationList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAssociationList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -95,7 +116,8 @@ public async Task<Association> CustomObjectClassesCustomObjectsAssociationsUpdat
         string sourceObjectId,
         string targetClassId,
         string targetObjectId,
-        CustomObjectClassesCustomObjectsAssociationsUpdateRequest request
+        CustomObjectClassesCustomObjectsAssociationsUpdateRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -110,17 +132,31 @@ CustomObjectClassesCustomObjectsAssociationsUpdateRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Put,
                 Path =
                     $"crm/v1/custom-object-classes/{sourceClassId}/custom-objects/{sourceObjectId}/associations/{targetClassId}/{targetObjectId}/{associationTypeId}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Association>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Association>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Associations/Requests/CustomObjectClassesCustomObjectsAssociationsListRequest.cs b/src/Merge.Client/Crm/Associations/Requests/CustomObjectClassesCustomObjectsAssociationsListRequest.cs
index c40ea342..b2ba25b1 100644
--- a/src/Merge.Client/Crm/Associations/Requests/CustomObjectClassesCustomObjectsAssociationsListRequest.cs
+++ b/src/Merge.Client/Crm/Associations/Requests/CustomObjectClassesCustomObjectsAssociationsListRequest.cs
@@ -1,59 +1,59 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesCustomObjectsAssociationsListRequest
+public record CustomObjectClassesCustomObjectsAssociationsListRequest
 {
     /// <summary>
     /// If provided, will only return opportunities with this association_type.
     /// </summary>
-    public string? AssociationTypeId { get; init; }
+    public string? AssociationTypeId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Associations/Requests/CustomObjectClassesCustomObjectsAssociationsUpdateRequest.cs b/src/Merge.Client/Crm/Associations/Requests/CustomObjectClassesCustomObjectsAssociationsUpdateRequest.cs
index 8d647666..e182d64f 100644
--- a/src/Merge.Client/Crm/Associations/Requests/CustomObjectClassesCustomObjectsAssociationsUpdateRequest.cs
+++ b/src/Merge.Client/Crm/Associations/Requests/CustomObjectClassesCustomObjectsAssociationsUpdateRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesCustomObjectsAssociationsUpdateRequest
+public record CustomObjectClassesCustomObjectsAssociationsUpdateRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 }
diff --git a/src/Merge.Client/Crm/AsyncPassthrough/AsyncPassthroughClient.cs b/src/Merge.Client/Crm/AsyncPassthrough/AsyncPassthroughClient.cs
index 08a19507..8e5af997 100644
--- a/src/Merge.Client/Crm/AsyncPassthrough/AsyncPassthroughClient.cs
+++ b/src/Merge.Client/Crm/AsyncPassthrough/AsyncPassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,75 @@ public AsyncPassthroughClient(RawClient client)
     /// <summary>
     /// Asynchronously pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<AsyncPassthroughReciept> CreateAsync(DataPassthroughRequest request)
+    public async Task<AsyncPassthroughReciept> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/async-passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AsyncPassthroughReciept>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AsyncPassthroughReciept>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Retrieves data from earlier async-passthrough POST request
     /// </summary>
-    public async Task<RemoteResponse> RetrieveAsync(string asyncPassthroughReceiptId)
+    public async Task<RemoteResponse> RetrieveAsync(
+        string asyncPassthroughReceiptId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"crm/v1/async-passthrough/{asyncPassthroughReceiptId}"
+                Path = $"crm/v1/async-passthrough/{asyncPassthroughReceiptId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/AuditTrail/AuditTrailClient.cs b/src/Merge.Client/Crm/AuditTrail/AuditTrailClient.cs
index e9ac999c..4b1898d3 100644
--- a/src/Merge.Client/Crm/AuditTrail/AuditTrailClient.cs
+++ b/src/Merge.Client/Crm/AuditTrail/AuditTrailClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AuditTrailClient(RawClient client)
     /// <summary>
     /// Gets a list of audit trail events.
     /// </summary>
-    public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest request)
+    public async Task<PaginatedAuditLogEventList> ListAsync(
+        AuditTrailListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -48,16 +51,30 @@ public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/audit-trail",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAuditLogEventList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAuditLogEventList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/AuditTrail/Requests/AuditTrailListRequest.cs b/src/Merge.Client/Crm/AuditTrail/Requests/AuditTrailListRequest.cs
index 21af9f14..1e14ad70 100644
--- a/src/Merge.Client/Crm/AuditTrail/Requests/AuditTrailListRequest.cs
+++ b/src/Merge.Client/Crm/AuditTrail/Requests/AuditTrailListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class AuditTrailListRequest
+public record AuditTrailListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
     /// <summary>
     /// If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`, `END_USER_CREDENTIALS_ACCESSED`
     /// </summary>
-    public string? EventType { get; init; }
+    public string? EventType { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// If provided, this will return events associated with the specified user email. Please note that the email address reflects the user's email at the time of the event, and may not be their current email.
     /// </summary>
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 }
diff --git a/src/Merge.Client/Crm/AvailableActions/AvailableActionsClient.cs b/src/Merge.Client/Crm/AvailableActions/AvailableActionsClient.cs
index 7cceaf68..bebc0468 100644
--- a/src/Merge.Client/Crm/AvailableActions/AvailableActionsClient.cs
+++ b/src/Merge.Client/Crm/AvailableActions/AvailableActionsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AvailableActionsClient(RawClient client)
     /// <summary>
     /// Returns a list of models and actions available for an account.
     /// </summary>
-    public async Task<AvailableActions> RetrieveAsync()
+    public async Task<AvailableActions> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/available-actions"
+                Path = "crm/v1/available-actions",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AvailableActions>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AvailableActions>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Contacts/ContactsClient.cs b/src/Merge.Client/Crm/Contacts/ContactsClient.cs
index 07c71fcd..e35a1e71 100644
--- a/src/Merge.Client/Crm/Contacts/ContactsClient.cs
+++ b/src/Merge.Client/Crm/Contacts/ContactsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public ContactsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Contact` objects.
     /// </summary>
-    public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
+    public async Task<PaginatedContactList> ListAsync(
+        ContactsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -80,23 +89,40 @@ public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/contacts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedContactList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedContactList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Contact` object with the given values.
     /// </summary>
-    public async Task<CrmContactResponse> CreateAsync(CrmContactEndpointRequest request)
+    public async Task<CrmContactResponse> CreateAsync(
+        CrmContactEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -110,23 +136,41 @@ public async Task<CrmContactResponse> CreateAsync(CrmContactEndpointRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/contacts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CrmContactResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CrmContactResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Contact` object with the given `id`.
     /// </summary>
-    public async Task<Contact> RetrieveAsync(string id, ContactsRetrieveRequest request)
+    public async Task<Contact> RetrieveAsync(
+        string id,
+        ContactsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -144,17 +188,31 @@ public async Task<Contact> RetrieveAsync(string id, ContactsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/contacts/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Contact>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Contact>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -162,7 +220,8 @@ public async Task<Contact> RetrieveAsync(string id, ContactsRetrieveRequest requ
     /// </summary>
     public async Task<CrmContactResponse> PartialUpdateAsync(
         string id,
-        PatchedCrmContactEndpointRequest request
+        PatchedCrmContactEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -177,79 +236,141 @@ PatchedCrmContactEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"crm/v1/contacts/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CrmContactResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CrmContactResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Ignores a specific row based on the `model_id` in the url. These records will have their properties set to null, and will not be updated in future syncs. The "reason" and "message" fields in the request body will be stored for audit purposes.
     /// </summary>
-    public async void IgnoreCreateAsync(string modelId, IgnoreCommonModelRequest request)
+    public async Task IgnoreCreateAsync(
+        string modelId,
+        IgnoreCommonModelRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = $"crm/v1/contacts/ignore/{modelId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `CRMContact` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"crm/v1/contacts/meta/patch/{id}"
+                Path = $"crm/v1/contacts/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `CRMContact` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/contacts/meta/post"
+                Path = "crm/v1/contacts/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        ContactsRemoteFieldClassesListRequest request
+        ContactsRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -280,16 +401,30 @@ ContactsRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/contacts/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Contacts/Requests/ContactsListRequest.cs b/src/Merge.Client/Crm/Contacts/Requests/ContactsListRequest.cs
index 7b3ff884..2d184759 100644
--- a/src/Merge.Client/Crm/Contacts/Requests/ContactsListRequest.cs
+++ b/src/Merge.Client/Crm/Contacts/Requests/ContactsListRequest.cs
@@ -1,78 +1,74 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class ContactsListRequest
+public record ContactsListRequest
 {
     /// <summary>
     /// If provided, will only return contacts with this account.
     /// </summary>
-    public string? AccountId { get; init; }
+    public string? AccountId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return contacts matching the email addresses; multiple email_addresses can be separated by commas.
     /// </summary>
-    public string? EmailAddresses { get; init; }
+    public string? EmailAddresses { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ContactsListRequestExpand? Expand { get; init; }
+    public ContactsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return contacts matching the phone numbers; multiple phone numbers can be separated by commas.
     /// </summary>
-    public string? PhoneNumbers { get; init; }
+    public string? PhoneNumbers { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Contacts/Requests/ContactsRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Contacts/Requests/ContactsRemoteFieldClassesListRequest.cs
index 28b9202e..c50ae481 100644
--- a/src/Merge.Client/Crm/Contacts/Requests/ContactsRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Contacts/Requests/ContactsRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class ContactsRemoteFieldClassesListRequest
+public record ContactsRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Contacts/Requests/ContactsRetrieveRequest.cs b/src/Merge.Client/Crm/Contacts/Requests/ContactsRetrieveRequest.cs
index 2f299953..0a38bf59 100644
--- a/src/Merge.Client/Crm/Contacts/Requests/ContactsRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Contacts/Requests/ContactsRetrieveRequest.cs
@@ -1,23 +1,19 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class ContactsRetrieveRequest
+public record ContactsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ContactsRetrieveRequestExpand? Expand { get; init; }
+    public ContactsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Contacts/Requests/CrmContactEndpointRequest.cs b/src/Merge.Client/Crm/Contacts/Requests/CrmContactEndpointRequest.cs
index 9dc031e4..0df1a418 100644
--- a/src/Merge.Client/Crm/Contacts/Requests/CrmContactEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Contacts/Requests/CrmContactEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class CrmContactEndpointRequest
+public record CrmContactEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public ContactRequest Model { get; init; }
+    public required ContactRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Contacts/Requests/PatchedCrmContactEndpointRequest.cs b/src/Merge.Client/Crm/Contacts/Requests/PatchedCrmContactEndpointRequest.cs
index d399f6d8..dc250e1e 100644
--- a/src/Merge.Client/Crm/Contacts/Requests/PatchedCrmContactEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Contacts/Requests/PatchedCrmContactEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class PatchedCrmContactEndpointRequest
+public record PatchedCrmContactEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PatchedContactRequest Model { get; init; }
+    public required PatchedContactRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Contacts/Types/ContactsListRequestExpand.cs b/src/Merge.Client/Crm/Contacts/Types/ContactsListRequestExpand.cs
index 194de8cf..6cc21f6d 100644
--- a/src/Merge.Client/Crm/Contacts/Types/ContactsListRequestExpand.cs
+++ b/src/Merge.Client/Crm/Contacts/Types/ContactsListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Contacts/Types/ContactsRetrieveRequestExpand.cs b/src/Merge.Client/Crm/Contacts/Types/ContactsRetrieveRequestExpand.cs
index cfb04a57..0ee1a697 100644
--- a/src/Merge.Client/Crm/Contacts/Types/ContactsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Crm/Contacts/Types/ContactsRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/CrmClient.cs b/src/Merge.Client/Crm/CrmClient.cs
index 5bd5f70f..78c6c028 100644
--- a/src/Merge.Client/Crm/CrmClient.cs
+++ b/src/Merge.Client/Crm/CrmClient.cs
@@ -1,5 +1,4 @@
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/CustomObjectClasses/CustomObjectClassesClient.cs b/src/Merge.Client/Crm/CustomObjectClasses/CustomObjectClassesClient.cs
index 43894fbf..f5e75e18 100644
--- a/src/Merge.Client/Crm/CustomObjectClasses/CustomObjectClassesClient.cs
+++ b/src/Merge.Client/Crm/CustomObjectClasses/CustomObjectClassesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,17 +19,20 @@ public CustomObjectClassesClient(RawClient client)
     /// Returns a list of `CustomObjectClass` objects.
     /// </summary>
     public async Task<PaginatedCustomObjectClassList> ListAsync(
-        CustomObjectClassesListRequest request
+        CustomObjectClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -49,11 +52,15 @@ CustomObjectClassesListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -66,17 +73,31 @@ CustomObjectClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/custom-object-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCustomObjectClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCustomObjectClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -84,7 +105,8 @@ CustomObjectClassesListRequest request
     /// </summary>
     public async Task<CustomObjectClass> RetrieveAsync(
         string id,
-        CustomObjectClassesRetrieveRequest request
+        CustomObjectClassesRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -99,16 +121,30 @@ CustomObjectClassesRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/custom-object-classes/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CustomObjectClass>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CustomObjectClass>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/CustomObjectClasses/Requests/CustomObjectClassesListRequest.cs b/src/Merge.Client/Crm/CustomObjectClasses/Requests/CustomObjectClassesListRequest.cs
index c1b44523..6a097322 100644
--- a/src/Merge.Client/Crm/CustomObjectClasses/Requests/CustomObjectClassesListRequest.cs
+++ b/src/Merge.Client/Crm/CustomObjectClasses/Requests/CustomObjectClassesListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesListRequest
+public record CustomObjectClassesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/CustomObjectClasses/Requests/CustomObjectClassesRetrieveRequest.cs b/src/Merge.Client/Crm/CustomObjectClasses/Requests/CustomObjectClassesRetrieveRequest.cs
index 9e015cac..7ab7badf 100644
--- a/src/Merge.Client/Crm/CustomObjectClasses/Requests/CustomObjectClassesRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/CustomObjectClasses/Requests/CustomObjectClassesRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesRetrieveRequest
+public record CustomObjectClassesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Crm/CustomObjects/CustomObjectsClient.cs b/src/Merge.Client/Crm/CustomObjects/CustomObjectsClient.cs
index 05cdd50f..16e6952c 100644
--- a/src/Merge.Client/Crm/CustomObjects/CustomObjectsClient.cs
+++ b/src/Merge.Client/Crm/CustomObjects/CustomObjectsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -20,17 +20,20 @@ public CustomObjectsClient(RawClient client)
     /// </summary>
     public async Task<PaginatedCustomObjectList> CustomObjectClassesCustomObjectsListAsync(
         string customObjectClassId,
-        CustomObjectClassesCustomObjectsListRequest request
+        CustomObjectClassesCustomObjectsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -50,11 +53,15 @@ CustomObjectClassesCustomObjectsListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -67,17 +74,31 @@ CustomObjectClassesCustomObjectsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/custom-object-classes/{customObjectClassId}/custom-objects",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCustomObjectList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCustomObjectList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -85,7 +106,8 @@ CustomObjectClassesCustomObjectsListRequest request
     /// </summary>
     public async Task<CrmCustomObjectResponse> CustomObjectClassesCustomObjectsCreateAsync(
         string customObjectClassId,
-        CrmCustomObjectEndpointRequest request
+        CrmCustomObjectEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -100,17 +122,31 @@ CrmCustomObjectEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = $"crm/v1/custom-object-classes/{customObjectClassId}/custom-objects",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CrmCustomObjectResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CrmCustomObjectResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -119,7 +155,8 @@ CrmCustomObjectEndpointRequest request
     public async Task<CustomObject> CustomObjectClassesCustomObjectsRetrieveAsync(
         string customObjectClassId,
         string id,
-        CustomObjectClassesCustomObjectsRetrieveRequest request
+        CustomObjectClassesCustomObjectsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -134,47 +171,77 @@ CustomObjectClassesCustomObjectsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/custom-object-classes/{customObjectClassId}/custom-objects/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CustomObject>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CustomObject>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `CRMCustomObject` POSTs.
     /// </summary>
     public async Task<MetaResponse> CustomObjectClassesCustomObjectsMetaPostRetrieveAsync(
-        string customObjectClassId
+        string customObjectClassId,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path =
-                    $"crm/v1/custom-object-classes/{customObjectClassId}/custom-objects/meta/post"
+                    $"crm/v1/custom-object-classes/{customObjectClassId}/custom-objects/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> CustomObjectClassesCustomObjectsRemoteFieldClassesListAsync(
-        CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest request
+        CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -205,16 +272,30 @@ CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/custom-object-classes/custom-objects/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/CustomObjects/Requests/CrmCustomObjectEndpointRequest.cs b/src/Merge.Client/Crm/CustomObjects/Requests/CrmCustomObjectEndpointRequest.cs
index 7dc550d5..3b977604 100644
--- a/src/Merge.Client/Crm/CustomObjects/Requests/CrmCustomObjectEndpointRequest.cs
+++ b/src/Merge.Client/Crm/CustomObjects/Requests/CrmCustomObjectEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class CrmCustomObjectEndpointRequest
+public record CrmCustomObjectEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public CustomObjectRequest Model { get; init; }
+    public required CustomObjectRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsListRequest.cs b/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsListRequest.cs
index bd87985b..15848ec5 100644
--- a/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsListRequest.cs
+++ b/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesCustomObjectsListRequest
+public record CustomObjectClassesCustomObjectsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest.cs
index aac859a5..ce7af16f 100644
--- a/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest
+public record CustomObjectClassesCustomObjectsRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsRetrieveRequest.cs b/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsRetrieveRequest.cs
index ef71d8d2..c7a7b317 100644
--- a/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/CustomObjects/Requests/CustomObjectClassesCustomObjectsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class CustomObjectClassesCustomObjectsRetrieveRequest
+public record CustomObjectClassesCustomObjectsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/DeleteAccount/DeleteAccountClient.cs b/src/Merge.Client/Crm/DeleteAccount/DeleteAccountClient.cs
index 92df8a08..a9edfa3e 100644
--- a/src/Merge.Client/Crm/DeleteAccount/DeleteAccountClient.cs
+++ b/src/Merge.Client/Crm/DeleteAccount/DeleteAccountClient.cs
@@ -1,4 +1,5 @@
-using Merge.Client;
+using System.Net.Http;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -16,14 +17,26 @@ public DeleteAccountClient(RawClient client)
     /// <summary>
     /// Delete a linked account.
     /// </summary>
-    public async void DeleteAsync()
+    public async Task DeleteAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "crm/v1/delete-account"
+                Path = "crm/v1/delete-account",
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/EngagementTypes/EngagementTypesClient.cs b/src/Merge.Client/Crm/EngagementTypes/EngagementTypesClient.cs
index 805a1ec9..ba046610 100644
--- a/src/Merge.Client/Crm/EngagementTypes/EngagementTypesClient.cs
+++ b/src/Merge.Client/Crm/EngagementTypes/EngagementTypesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public EngagementTypesClient(RawClient client)
     /// <summary>
     /// Returns a list of `EngagementType` objects.
     /// </summary>
-    public async Task<PaginatedEngagementTypeList> ListAsync(EngagementTypesListRequest request)
+    public async Task<PaginatedEngagementTypeList> ListAsync(
+        EngagementTypesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedEngagementTypeList> ListAsync(EngagementTypesListRequ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -64,17 +73,31 @@ public async Task<PaginatedEngagementTypeList> ListAsync(EngagementTypesListRequ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/engagement-types",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedEngagementTypeList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedEngagementTypeList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -82,7 +105,8 @@ public async Task<PaginatedEngagementTypeList> ListAsync(EngagementTypesListRequ
     /// </summary>
     public async Task<EngagementType> RetrieveAsync(
         string id,
-        EngagementTypesRetrieveRequest request
+        EngagementTypesRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -97,24 +121,39 @@ EngagementTypesRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/engagement-types/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<EngagementType>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<EngagementType>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        EngagementTypesRemoteFieldClassesListRequest request
+        EngagementTypesRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -145,16 +184,30 @@ EngagementTypesRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/engagement-types/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesListRequest.cs b/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesListRequest.cs
index 0d348864..8ca09bea 100644
--- a/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesListRequest.cs
+++ b/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Crm;
 
-public class EngagementTypesListRequest
+public record EngagementTypesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesRemoteFieldClassesListRequest.cs
index 4be7e207..2bfd7f69 100644
--- a/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class EngagementTypesRemoteFieldClassesListRequest
+public record EngagementTypesRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesRetrieveRequest.cs b/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesRetrieveRequest.cs
index 9c2a3e0b..51c39565 100644
--- a/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/EngagementTypes/Requests/EngagementTypesRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class EngagementTypesRetrieveRequest
+public record EngagementTypesRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Engagements/EngagementsClient.cs b/src/Merge.Client/Crm/Engagements/EngagementsClient.cs
index d673eb27..2ff8e4b6 100644
--- a/src/Merge.Client/Crm/Engagements/EngagementsClient.cs
+++ b/src/Merge.Client/Crm/Engagements/EngagementsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public EngagementsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Engagement` objects.
     /// </summary>
-    public async Task<PaginatedEngagementList> ListAsync(EngagementsListRequest request)
+    public async Task<PaginatedEngagementList> ListAsync(
+        EngagementsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedEngagementList> ListAsync(EngagementsListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -67,32 +76,51 @@ public async Task<PaginatedEngagementList> ListAsync(EngagementsListRequest requ
         }
         if (request.StartedAfter != null)
         {
-            _query["started_after"] = request.StartedAfter.Value.ToString("o0");
+            _query["started_after"] = request.StartedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.StartedBefore != null)
         {
-            _query["started_before"] = request.StartedBefore.Value.ToString("o0");
+            _query["started_before"] = request.StartedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/engagements",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedEngagementList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedEngagementList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Engagement` object with the given values.
     /// </summary>
-    public async Task<EngagementResponse> CreateAsync(EngagementEndpointRequest request)
+    public async Task<EngagementResponse> CreateAsync(
+        EngagementEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -106,23 +134,41 @@ public async Task<EngagementResponse> CreateAsync(EngagementEndpointRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/engagements",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<EngagementResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<EngagementResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Engagement` object with the given `id`.
     /// </summary>
-    public async Task<Engagement> RetrieveAsync(string id, EngagementsRetrieveRequest request)
+    public async Task<Engagement> RetrieveAsync(
+        string id,
+        EngagementsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -140,17 +186,31 @@ public async Task<Engagement> RetrieveAsync(string id, EngagementsRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/engagements/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Engagement>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Engagement>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -158,7 +218,8 @@ public async Task<Engagement> RetrieveAsync(string id, EngagementsRetrieveReques
     /// </summary>
     public async Task<EngagementResponse> PartialUpdateAsync(
         string id,
-        PatchedEngagementEndpointRequest request
+        PatchedEngagementEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -173,64 +234,110 @@ PatchedEngagementEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"crm/v1/engagements/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<EngagementResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<EngagementResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Engagement` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"crm/v1/engagements/meta/patch/{id}"
+                Path = $"crm/v1/engagements/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Engagement` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/engagements/meta/post"
+                Path = "crm/v1/engagements/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        EngagementsRemoteFieldClassesListRequest request
+        EngagementsRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -261,16 +368,30 @@ EngagementsRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/engagements/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Engagements/Requests/EngagementEndpointRequest.cs b/src/Merge.Client/Crm/Engagements/Requests/EngagementEndpointRequest.cs
index 40892ab7..7d76873e 100644
--- a/src/Merge.Client/Crm/Engagements/Requests/EngagementEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Engagements/Requests/EngagementEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class EngagementEndpointRequest
+public record EngagementEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public EngagementRequest Model { get; init; }
+    public required EngagementRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Engagements/Requests/EngagementsListRequest.cs b/src/Merge.Client/Crm/Engagements/Requests/EngagementsListRequest.cs
index 091c896b..58604d8b 100644
--- a/src/Merge.Client/Crm/Engagements/Requests/EngagementsListRequest.cs
+++ b/src/Merge.Client/Crm/Engagements/Requests/EngagementsListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class EngagementsListRequest
+public record EngagementsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public EngagementsListRequestExpand? Expand { get; init; }
+    public EngagementsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return engagements started after this datetime.
     /// </summary>
-    public DateTime? StartedAfter { get; init; }
+    public DateTime? StartedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return engagements started before this datetime.
     /// </summary>
-    public DateTime? StartedBefore { get; init; }
+    public DateTime? StartedBefore { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Engagements/Requests/EngagementsRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Engagements/Requests/EngagementsRemoteFieldClassesListRequest.cs
index f858fec5..732b34c7 100644
--- a/src/Merge.Client/Crm/Engagements/Requests/EngagementsRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Engagements/Requests/EngagementsRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class EngagementsRemoteFieldClassesListRequest
+public record EngagementsRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Engagements/Requests/EngagementsRetrieveRequest.cs b/src/Merge.Client/Crm/Engagements/Requests/EngagementsRetrieveRequest.cs
index 950096b1..efd98cf7 100644
--- a/src/Merge.Client/Crm/Engagements/Requests/EngagementsRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Engagements/Requests/EngagementsRetrieveRequest.cs
@@ -1,23 +1,19 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class EngagementsRetrieveRequest
+public record EngagementsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public EngagementsRetrieveRequestExpand? Expand { get; init; }
+    public EngagementsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Engagements/Requests/PatchedEngagementEndpointRequest.cs b/src/Merge.Client/Crm/Engagements/Requests/PatchedEngagementEndpointRequest.cs
index 2f093cec..801eb784 100644
--- a/src/Merge.Client/Crm/Engagements/Requests/PatchedEngagementEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Engagements/Requests/PatchedEngagementEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class PatchedEngagementEndpointRequest
+public record PatchedEngagementEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PatchedEngagementRequest Model { get; init; }
+    public required PatchedEngagementRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Engagements/Types/EngagementsListRequestExpand.cs b/src/Merge.Client/Crm/Engagements/Types/EngagementsListRequestExpand.cs
index 9b925ba9..af747bee 100644
--- a/src/Merge.Client/Crm/Engagements/Types/EngagementsListRequestExpand.cs
+++ b/src/Merge.Client/Crm/Engagements/Types/EngagementsListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Engagements/Types/EngagementsRetrieveRequestExpand.cs b/src/Merge.Client/Crm/Engagements/Types/EngagementsRetrieveRequestExpand.cs
index 1e41b9a2..ce927720 100644
--- a/src/Merge.Client/Crm/Engagements/Types/EngagementsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Crm/Engagements/Types/EngagementsRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/FieldMapping/FieldMappingClient.cs b/src/Merge.Client/Crm/FieldMapping/FieldMappingClient.cs
index 64b842c5..a3de0e1b 100644
--- a/src/Merge.Client/Crm/FieldMapping/FieldMappingClient.cs
+++ b/src/Merge.Client/Crm/FieldMapping/FieldMappingClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,60 +18,112 @@ public FieldMappingClient(RawClient client)
     /// <summary>
     /// Get all Field Mappings for this Linked Account. Field Mappings are mappings between third-party Remote Fields and user defined Merge fields. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
-    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync()
+    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = "crm/v1/field-mappings" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = "crm/v1/field-mappings",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingApiInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingApiInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Create new Field Mappings that will be available after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsCreateAsync(
-        CreateFieldMappingRequest request
+        CreateFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/field-mappings",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Deletes Field Mappings for a Linked Account. All data related to this Field Mapping will be deleted and these changes will be reflected after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
-    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string fieldMappingId)
+    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(
+        string fieldMappingId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Delete,
-                Path = $"crm/v1/field-mappings/{fieldMappingId}"
+                Path = $"crm/v1/field-mappings/{fieldMappingId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -79,30 +131,46 @@ public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsPartialUpdateAsync(
         string fieldMappingId,
-        PatchedEditFieldMappingRequest request
+        PatchedEditFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"crm/v1/field-mappings/{fieldMappingId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all remote fields for a Linked Account. Remote fields are third-party fields that are accessible after initial sync if remote_data is enabled. You can use remote fields to override existing Merge fields or map a new Merge field. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
     public async Task<RemoteFieldApiResponse> RemoteFieldsRetrieveAsync(
-        RemoteFieldsRetrieveRequest request
+        RemoteFieldsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -117,32 +185,66 @@ RemoteFieldsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/remote-fields",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all organization-wide Target Fields, this will not include any Linked Account specific Target Fields. Organization-wide Target Fields are additional fields appended to the Merge Common Model for all Linked Accounts in a category. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/target-fields/).
     /// </summary>
-    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync()
+    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = "crm/v1/target-fields" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = "crm/v1/target-fields",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ExternalTargetFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ExternalTargetFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/FieldMapping/Requests/CreateFieldMappingRequest.cs b/src/Merge.Client/Crm/FieldMapping/Requests/CreateFieldMappingRequest.cs
index 5818a5d1..33f313df 100644
--- a/src/Merge.Client/Crm/FieldMapping/Requests/CreateFieldMappingRequest.cs
+++ b/src/Merge.Client/Crm/FieldMapping/Requests/CreateFieldMappingRequest.cs
@@ -4,41 +4,41 @@
 
 namespace Merge.Client.Crm;
 
-public class CreateFieldMappingRequest
+public record CreateFieldMappingRequest
 {
     /// <summary>
     /// The name of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_name")]
-    public string TargetFieldName { get; init; }
+    public required string TargetFieldName { get; set; }
 
     /// <summary>
     /// The description of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_description")]
-    public string TargetFieldDescription { get; init; }
+    public required string TargetFieldDescription { get; set; }
 
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object> RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object> RemoteFieldTraversalPath { get; set; } = new List<object>();
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string RemoteMethod { get; init; }
+    public required string RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string RemoteUrlPath { get; init; }
+    public required string RemoteUrlPath { get; set; }
 
     /// <summary>
     /// The name of the Common Model that the remote field corresponds to in a given category.
     /// </summary>
     [JsonPropertyName("common_model_name")]
-    public string CommonModelName { get; init; }
+    public required string CommonModelName { get; set; }
 }
diff --git a/src/Merge.Client/Crm/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs b/src/Merge.Client/Crm/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
index aa2267b4..66850be7 100644
--- a/src/Merge.Client/Crm/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
+++ b/src/Merge.Client/Crm/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Crm;
 
-public class PatchedEditFieldMappingRequest
+public record PatchedEditFieldMappingRequest
 {
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object>? RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object>? RemoteFieldTraversalPath { get; set; }
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string? RemoteMethod { get; init; }
+    public string? RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string? RemoteUrlPath { get; init; }
+    public string? RemoteUrlPath { get; set; }
 }
diff --git a/src/Merge.Client/Crm/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs b/src/Merge.Client/Crm/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
index 12dbacdd..5d3c69f2 100644
--- a/src/Merge.Client/Crm/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class RemoteFieldsRetrieveRequest
+public record RemoteFieldsRetrieveRequest
 {
     /// <summary>
     /// A comma seperated list of Common Model names. If included, will only return Remote Fields for those Common Models.
     /// </summary>
-    public string? CommonModels { get; init; }
+    public string? CommonModels { get; set; }
 
     /// <summary>
     /// If true, will include example values, where available, for remote fields in the 3rd party platform. These examples come from active data from your customers.
     /// </summary>
-    public string? IncludeExampleValues { get; init; }
+    public string? IncludeExampleValues { get; set; }
 }
diff --git a/src/Merge.Client/Crm/ForceResync/ForceResyncClient.cs b/src/Merge.Client/Crm/ForceResync/ForceResyncClient.cs
index b9b1075d..6f6cb3d6 100644
--- a/src/Merge.Client/Crm/ForceResync/ForceResyncClient.cs
+++ b/src/Merge.Client/Crm/ForceResync/ForceResyncClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,36 @@ public ForceResyncClient(RawClient client)
     /// <summary>
     /// Force re-sync of all models. This is available for all organizations via the dashboard. Force re-sync is also available programmatically via API for monthly, quarterly, and highest sync frequency customers on the Launch, Professional, or Enterprise plans. Doing so will consume a sync credit for the relevant linked account.
     /// </summary>
-    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync()
+    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "crm/v1/sync-status/resync"
+                Path = "crm/v1/sync-status/resync",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<SyncStatus>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<SyncStatus>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/GenerateKey/GenerateKeyClient.cs b/src/Merge.Client/Crm/GenerateKey/GenerateKeyClient.cs
index f1bb1e62..fa2862f8 100644
--- a/src/Merge.Client/Crm/GenerateKey/GenerateKeyClient.cs
+++ b/src/Merge.Client/Crm/GenerateKey/GenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public GenerateKeyClient(RawClient client)
     /// <summary>
     /// Create a remote key.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(GenerateRemoteKeyRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        GenerateRemoteKeyRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/generate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/GenerateKey/Requests/GenerateRemoteKeyRequest.cs b/src/Merge.Client/Crm/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
index 7c342d38..3d98234e 100644
--- a/src/Merge.Client/Crm/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
+++ b/src/Merge.Client/Crm/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class GenerateRemoteKeyRequest
+public record GenerateRemoteKeyRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Issues/IssuesClient.cs b/src/Merge.Client/Crm/Issues/IssuesClient.cs
index 6bf9dc12..de8fff6c 100644
--- a/src/Merge.Client/Crm/Issues/IssuesClient.cs
+++ b/src/Merge.Client/Crm/Issues/IssuesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public IssuesClient(RawClient client)
     /// <summary>
     /// Gets all issues for Organization.
     /// </summary>
-    public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
+    public async Task<PaginatedIssueList> ListAsync(
+        IssuesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountToken != null)
@@ -40,13 +43,13 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         if (request.FirstIncidentTimeAfter != null)
         {
             _query["first_incident_time_after"] = request.FirstIncidentTimeAfter.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.FirstIncidentTimeBefore != null)
         {
             _query["first_incident_time_before"] = request.FirstIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.IncludeMuted != null)
@@ -59,12 +62,14 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         }
         if (request.LastIncidentTimeAfter != null)
         {
-            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString("o0");
+            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.LastIncidentTimeBefore != null)
         {
             _query["last_incident_time_before"] = request.LastIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.LinkedAccountId != null)
@@ -86,32 +91,64 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/issues",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedIssueList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedIssueList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get a specific issue.
     /// </summary>
-    public async Task<Issue> RetrieveAsync(string id)
+    public async Task<Issue> RetrieveAsync(string id, RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = $"crm/v1/issues/{id}" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = $"crm/v1/issues/{id}",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Issue>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Issue>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Issues/Requests/IssuesListRequest.cs b/src/Merge.Client/Crm/Issues/Requests/IssuesListRequest.cs
index 74dcd585..f36b535a 100644
--- a/src/Merge.Client/Crm/Issues/Requests/IssuesListRequest.cs
+++ b/src/Merge.Client/Crm/Issues/Requests/IssuesListRequest.cs
@@ -1,66 +1,62 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class IssuesListRequest
+public record IssuesListRequest
 {
-    public string? AccountToken { get; init; }
+    public string? AccountToken { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was after this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeAfter { get; init; }
+    public DateTime? FirstIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was before this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeBefore { get; init; }
+    public DateTime? FirstIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If true, will include muted issues
     /// </summary>
-    public string? IncludeMuted { get; init; }
+    public string? IncludeMuted { get; set; }
 
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was after this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeAfter { get; init; }
+    public DateTime? LastIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was before this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeBefore { get; init; }
+    public DateTime? LastIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If provided, will only include issues pertaining to the linked account passed in.
     /// </summary>
-    public string? LinkedAccountId { get; init; }
+    public string? LinkedAccountId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -68,5 +64,5 @@ public class IssuesListRequest
     /// - `ONGOING` - ONGOING
     /// - `RESOLVED` - RESOLVED
     /// </summary>
-    public IssuesListRequestStatus? Status { get; init; }
+    public IssuesListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Issues/Types/IssuesListRequestStatus.cs b/src/Merge.Client/Crm/Issues/Types/IssuesListRequestStatus.cs
index a4ef7cc5..85dfcc60 100644
--- a/src/Merge.Client/Crm/Issues/Types/IssuesListRequestStatus.cs
+++ b/src/Merge.Client/Crm/Issues/Types/IssuesListRequestStatus.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Leads/LeadsClient.cs b/src/Merge.Client/Crm/Leads/LeadsClient.cs
index 930e8a33..0d8207d2 100644
--- a/src/Merge.Client/Crm/Leads/LeadsClient.cs
+++ b/src/Merge.Client/Crm/Leads/LeadsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public LeadsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Lead` objects.
     /// </summary>
-    public async Task<PaginatedLeadList> ListAsync(LeadsListRequest request)
+    public async Task<PaginatedLeadList> ListAsync(
+        LeadsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.ConvertedAccountId != null)
@@ -31,11 +34,13 @@ public async Task<PaginatedLeadList> ListAsync(LeadsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -63,11 +68,15 @@ public async Task<PaginatedLeadList> ListAsync(LeadsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.OwnerId != null)
         {
@@ -88,23 +97,40 @@ public async Task<PaginatedLeadList> ListAsync(LeadsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/leads",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedLeadList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedLeadList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Lead` object with the given values.
     /// </summary>
-    public async Task<LeadResponse> CreateAsync(LeadEndpointRequest request)
+    public async Task<LeadResponse> CreateAsync(
+        LeadEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -118,23 +144,41 @@ public async Task<LeadResponse> CreateAsync(LeadEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/leads",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<LeadResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<LeadResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Lead` object with the given `id`.
     /// </summary>
-    public async Task<Lead> RetrieveAsync(string id, LeadsRetrieveRequest request)
+    public async Task<Lead> RetrieveAsync(
+        string id,
+        LeadsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -152,44 +196,73 @@ public async Task<Lead> RetrieveAsync(string id, LeadsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/leads/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Lead>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Lead>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Lead` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/leads/meta/post"
+                Path = "crm/v1/leads/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        LeadsRemoteFieldClassesListRequest request
+        LeadsRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -220,16 +293,30 @@ LeadsRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/leads/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Leads/Requests/LeadEndpointRequest.cs b/src/Merge.Client/Crm/Leads/Requests/LeadEndpointRequest.cs
index 9a61bbaf..f1f3b58d 100644
--- a/src/Merge.Client/Crm/Leads/Requests/LeadEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Leads/Requests/LeadEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class LeadEndpointRequest
+public record LeadEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public LeadRequest Model { get; init; }
+    public required LeadRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Leads/Requests/LeadsListRequest.cs b/src/Merge.Client/Crm/Leads/Requests/LeadsListRequest.cs
index 6fcb9c59..e5f4d017 100644
--- a/src/Merge.Client/Crm/Leads/Requests/LeadsListRequest.cs
+++ b/src/Merge.Client/Crm/Leads/Requests/LeadsListRequest.cs
@@ -1,88 +1,84 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class LeadsListRequest
+public record LeadsListRequest
 {
     /// <summary>
     /// If provided, will only return leads with this account.
     /// </summary>
-    public string? ConvertedAccountId { get; init; }
+    public string? ConvertedAccountId { get; set; }
 
     /// <summary>
     /// If provided, will only return leads with this contact.
     /// </summary>
-    public string? ConvertedContactId { get; init; }
+    public string? ConvertedContactId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return contacts matching the email addresses; multiple email_addresses can be separated by commas.
     /// </summary>
-    public string? EmailAddresses { get; init; }
+    public string? EmailAddresses { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public LeadsListRequestExpand? Expand { get; init; }
+    public LeadsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return leads with this owner.
     /// </summary>
-    public string? OwnerId { get; init; }
+    public string? OwnerId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return contacts matching the phone numbers; multiple phone numbers can be separated by commas.
     /// </summary>
-    public string? PhoneNumbers { get; init; }
+    public string? PhoneNumbers { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Leads/Requests/LeadsRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Leads/Requests/LeadsRemoteFieldClassesListRequest.cs
index f4c6ab4a..8054e1a8 100644
--- a/src/Merge.Client/Crm/Leads/Requests/LeadsRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Leads/Requests/LeadsRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class LeadsRemoteFieldClassesListRequest
+public record LeadsRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Leads/Requests/LeadsRetrieveRequest.cs b/src/Merge.Client/Crm/Leads/Requests/LeadsRetrieveRequest.cs
index a131cfb0..bb868a34 100644
--- a/src/Merge.Client/Crm/Leads/Requests/LeadsRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Leads/Requests/LeadsRetrieveRequest.cs
@@ -1,23 +1,19 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class LeadsRetrieveRequest
+public record LeadsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public LeadsRetrieveRequestExpand? Expand { get; init; }
+    public LeadsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Leads/Types/LeadsListRequestExpand.cs b/src/Merge.Client/Crm/Leads/Types/LeadsListRequestExpand.cs
index 5aa56ede..41b9d79b 100644
--- a/src/Merge.Client/Crm/Leads/Types/LeadsListRequestExpand.cs
+++ b/src/Merge.Client/Crm/Leads/Types/LeadsListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Leads/Types/LeadsRetrieveRequestExpand.cs b/src/Merge.Client/Crm/Leads/Types/LeadsRetrieveRequestExpand.cs
index 0243ad2d..be08ce31 100644
--- a/src/Merge.Client/Crm/Leads/Types/LeadsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Crm/Leads/Types/LeadsRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/LinkToken/LinkTokenClient.cs b/src/Merge.Client/Crm/LinkToken/LinkTokenClient.cs
index 7f224669..ec050676 100644
--- a/src/Merge.Client/Crm/LinkToken/LinkTokenClient.cs
+++ b/src/Merge.Client/Crm/LinkToken/LinkTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public LinkTokenClient(RawClient client)
     /// <summary>
     /// Creates a link token to be used when linking a new end user.
     /// </summary>
-    public async Task<LinkToken> CreateAsync(EndUserDetailsRequest request)
+    public async Task<LinkToken> CreateAsync(
+        EndUserDetailsRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/link-token",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<LinkToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<LinkToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/LinkToken/Requests/EndUserDetailsRequest.cs b/src/Merge.Client/Crm/LinkToken/Requests/EndUserDetailsRequest.cs
index 268ae3a9..0542c9b4 100644
--- a/src/Merge.Client/Crm/LinkToken/Requests/EndUserDetailsRequest.cs
+++ b/src/Merge.Client/Crm/LinkToken/Requests/EndUserDetailsRequest.cs
@@ -1,65 +1,64 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class EndUserDetailsRequest
+public record EndUserDetailsRequest
 {
     /// <summary>
     /// Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.
     /// </summary>
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// Your end user's organization.
     /// </summary>
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.
     /// </summary>
     [JsonPropertyName("end_user_origin_id")]
-    public string EndUserOriginId { get; init; }
+    public required string EndUserOriginId { get; set; }
 
     /// <summary>
     /// The integration categories to show in Merge Link.
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     /// <summary>
     /// The slug of a specific pre-selected integration for this linking flow token. For examples of slugs, see https://docs.merge.dev/guides/merge-link/single-integration/.
     /// </summary>
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     /// <summary>
     /// An integer number of minutes between [30, 720 or 10080 if for a Magic Link URL] for how long this token is valid. Defaults to 30.
     /// </summary>
     [JsonPropertyName("link_expiry_mins")]
-    public int? LinkExpiryMins { get; init; }
+    public int? LinkExpiryMins { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("should_create_magic_link_url")]
-    public bool? ShouldCreateMagicLinkUrl { get; init; }
+    public bool? ShouldCreateMagicLinkUrl { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL on the Admin Needed screen during the linking flow. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("hide_admin_magic_link")]
-    public bool? HideAdminMagicLink { get; init; }
+    public bool? HideAdminMagicLink { get; set; }
 
     /// <summary>
     /// An array of objects to specify the models and fields that will be disabled for a given Linked Account. Each object uses model_id, enabled_actions, and disabled_fields to specify the model, method, and fields that are scoped for a given Linked Account.
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; init; }
+    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; set; }
 
     /// <summary>
     /// When creating a Link Token, you can set permissions for Common Models that will apply to the account that is going to be linked. Any model or field not specified in link token payload will default to existing settings.
@@ -68,17 +67,17 @@ public class EndUserDetailsRequest
     public Dictionary<
         string,
         IEnumerable<IndividualCommonModelScopeDeserializerRequest>?
-    >? CategoryCommonModelScopes { get; init; }
+    >? CategoryCommonModelScopes { get; set; }
 
     /// <summary>
     /// The language code for the language to localize Merge Link to.
     /// </summary>
     [JsonPropertyName("language")]
-    public string? Language { get; init; }
+    public string? Language { get; set; }
 
     /// <summary>
     /// A JSON object containing integration-specific configuration options.
     /// </summary>
     [JsonPropertyName("integration_specific_config")]
-    public Dictionary<string, object>? IntegrationSpecificConfig { get; init; }
+    public Dictionary<string, object?>? IntegrationSpecificConfig { get; set; }
 }
diff --git a/src/Merge.Client/Crm/LinkedAccounts/LinkedAccountsClient.cs b/src/Merge.Client/Crm/LinkedAccounts/LinkedAccountsClient.cs
index ffa530be..89e61f6f 100644
--- a/src/Merge.Client/Crm/LinkedAccounts/LinkedAccountsClient.cs
+++ b/src/Merge.Client/Crm/LinkedAccounts/LinkedAccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,7 +19,8 @@ public LinkedAccountsClient(RawClient client)
     /// List linked accounts for your organization.
     /// </summary>
     public async Task<PaginatedAccountDetailsAndActionsList> ListAsync(
-        LinkedAccountsListRequest request
+        LinkedAccountsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -78,16 +79,30 @@ LinkedAccountsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/linked-accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/LinkedAccounts/Requests/LinkedAccountsListRequest.cs b/src/Merge.Client/Crm/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
index 47629fb7..a43cf9d4 100644
--- a/src/Merge.Client/Crm/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
+++ b/src/Merge.Client/Crm/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
@@ -1,10 +1,6 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class LinkedAccountsListRequest
+public record LinkedAccountsListRequest
 {
     /// <summary>
     /// Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
@@ -17,62 +13,62 @@ public class LinkedAccountsListRequest
     /// - `mktg` - mktg
     /// - `filestorage` - filestorage
     /// </summary>
-    public LinkedAccountsListRequestCategory? Category { get; init; }
+    public LinkedAccountsListRequestCategory? Category { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given email address.
     /// </summary>
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given organization name.
     /// </summary>
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given origin ID.
     /// </summary>
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     /// <summary>
     /// Comma-separated list of EndUser origin IDs, making it possible to specify multiple EndUsers at once.
     /// </summary>
-    public string? EndUserOriginIds { get; init; }
+    public string? EndUserOriginIds { get; set; }
 
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Comma-separated list of LinkedAccount IDs, making it possible to specify multiple LinkedAccounts at once.
     /// </summary>
-    public string? Ids { get; init; }
+    public string? Ids { get; set; }
 
     /// <summary>
     /// If `true`, will include complete production duplicates of the account specified by the `id` query parameter in the response. `id` must be for a complete production linked account.
     /// </summary>
-    public bool? IncludeDuplicates { get; init; }
+    public bool? IncludeDuplicates { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given integration name.
     /// </summary>
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If included, will only include test linked accounts. If not included, will only include non-test linked accounts.
     /// </summary>
-    public string? IsTestAccount { get; init; }
+    public string? IsTestAccount { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Filter by status. Options: `COMPLETE`, `INCOMPLETE`, `RELINK_NEEDED`
     /// </summary>
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 }
diff --git a/src/Merge.Client/Crm/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs b/src/Merge.Client/Crm/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
index abd35aa8..5d7f7270 100644
--- a/src/Merge.Client/Crm/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
+++ b/src/Merge.Client/Crm/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Notes/NotesClient.cs b/src/Merge.Client/Crm/Notes/NotesClient.cs
index 72aa92ce..404570c2 100644
--- a/src/Merge.Client/Crm/Notes/NotesClient.cs
+++ b/src/Merge.Client/Crm/Notes/NotesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public NotesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Note` objects.
     /// </summary>
-    public async Task<PaginatedNoteList> ListAsync(NotesListRequest request)
+    public async Task<PaginatedNoteList> ListAsync(
+        NotesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountId != null)
@@ -31,11 +34,13 @@ public async Task<PaginatedNoteList> ListAsync(NotesListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedNoteList> ListAsync(NotesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.OpportunityId != null)
         {
@@ -84,23 +93,40 @@ public async Task<PaginatedNoteList> ListAsync(NotesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/notes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedNoteList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedNoteList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Note` object with the given values.
     /// </summary>
-    public async Task<NoteResponse> CreateAsync(NoteEndpointRequest request)
+    public async Task<NoteResponse> CreateAsync(
+        NoteEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -114,23 +140,41 @@ public async Task<NoteResponse> CreateAsync(NoteEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/notes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<NoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<NoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Note` object with the given `id`.
     /// </summary>
-    public async Task<Note> RetrieveAsync(string id, NotesRetrieveRequest request)
+    public async Task<Note> RetrieveAsync(
+        string id,
+        NotesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -148,44 +192,73 @@ public async Task<Note> RetrieveAsync(string id, NotesRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/notes/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Note>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Note>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Note` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/notes/meta/post"
+                Path = "crm/v1/notes/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        NotesRemoteFieldClassesListRequest request
+        NotesRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -216,16 +289,30 @@ NotesRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/notes/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Notes/Requests/NoteEndpointRequest.cs b/src/Merge.Client/Crm/Notes/Requests/NoteEndpointRequest.cs
index 60d75657..796cd1a5 100644
--- a/src/Merge.Client/Crm/Notes/Requests/NoteEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Notes/Requests/NoteEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class NoteEndpointRequest
+public record NoteEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public NoteRequest Model { get; init; }
+    public required NoteRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Notes/Requests/NotesListRequest.cs b/src/Merge.Client/Crm/Notes/Requests/NotesListRequest.cs
index 75c88a1f..0d933c89 100644
--- a/src/Merge.Client/Crm/Notes/Requests/NotesListRequest.cs
+++ b/src/Merge.Client/Crm/Notes/Requests/NotesListRequest.cs
@@ -1,83 +1,79 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class NotesListRequest
+public record NotesListRequest
 {
     /// <summary>
     /// If provided, will only return notes with this account.
     /// </summary>
-    public string? AccountId { get; init; }
+    public string? AccountId { get; set; }
 
     /// <summary>
     /// If provided, will only return notes with this contact.
     /// </summary>
-    public string? ContactId { get; init; }
+    public string? ContactId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public NotesListRequestExpand? Expand { get; init; }
+    public NotesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return notes with this opportunity.
     /// </summary>
-    public string? OpportunityId { get; init; }
+    public string? OpportunityId { get; set; }
 
     /// <summary>
     /// If provided, will only return notes with this owner.
     /// </summary>
-    public string? OwnerId { get; init; }
+    public string? OwnerId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Notes/Requests/NotesRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Notes/Requests/NotesRemoteFieldClassesListRequest.cs
index 5ad7d256..ccf74947 100644
--- a/src/Merge.Client/Crm/Notes/Requests/NotesRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Notes/Requests/NotesRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class NotesRemoteFieldClassesListRequest
+public record NotesRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Notes/Requests/NotesRetrieveRequest.cs b/src/Merge.Client/Crm/Notes/Requests/NotesRetrieveRequest.cs
index d4708d8f..80d55b42 100644
--- a/src/Merge.Client/Crm/Notes/Requests/NotesRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Notes/Requests/NotesRetrieveRequest.cs
@@ -1,23 +1,19 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class NotesRetrieveRequest
+public record NotesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public NotesRetrieveRequestExpand? Expand { get; init; }
+    public NotesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Notes/Types/NotesListRequestExpand.cs b/src/Merge.Client/Crm/Notes/Types/NotesListRequestExpand.cs
index 678b28e5..5e1fb732 100644
--- a/src/Merge.Client/Crm/Notes/Types/NotesListRequestExpand.cs
+++ b/src/Merge.Client/Crm/Notes/Types/NotesListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Notes/Types/NotesRetrieveRequestExpand.cs b/src/Merge.Client/Crm/Notes/Types/NotesRetrieveRequestExpand.cs
index c5efae76..9001fa43 100644
--- a/src/Merge.Client/Crm/Notes/Types/NotesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Crm/Notes/Types/NotesRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Opportunities/OpportunitiesClient.cs b/src/Merge.Client/Crm/Opportunities/OpportunitiesClient.cs
index bbaab5f8..38d8e996 100644
--- a/src/Merge.Client/Crm/Opportunities/OpportunitiesClient.cs
+++ b/src/Merge.Client/Crm/Opportunities/OpportunitiesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public OpportunitiesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Opportunity` objects.
     /// </summary>
-    public async Task<PaginatedOpportunityList> ListAsync(OpportunitiesListRequest request)
+    public async Task<PaginatedOpportunityList> ListAsync(
+        OpportunitiesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedOpportunityList> ListAsync(OpportunitiesListRequest r
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -55,11 +60,15 @@ public async Task<PaginatedOpportunityList> ListAsync(OpportunitiesListRequest r
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.OwnerId != null)
         {
@@ -71,7 +80,9 @@ public async Task<PaginatedOpportunityList> ListAsync(OpportunitiesListRequest r
         }
         if (request.RemoteCreatedAfter != null)
         {
-            _query["remote_created_after"] = request.RemoteCreatedAfter.Value.ToString("o0");
+            _query["remote_created_after"] = request.RemoteCreatedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.RemoteFields != null)
         {
@@ -96,23 +107,40 @@ public async Task<PaginatedOpportunityList> ListAsync(OpportunitiesListRequest r
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/opportunities",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedOpportunityList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedOpportunityList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Opportunity` object with the given values.
     /// </summary>
-    public async Task<OpportunityResponse> CreateAsync(OpportunityEndpointRequest request)
+    public async Task<OpportunityResponse> CreateAsync(
+        OpportunityEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -126,23 +154,41 @@ public async Task<OpportunityResponse> CreateAsync(OpportunityEndpointRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/opportunities",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<OpportunityResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<OpportunityResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Opportunity` object with the given `id`.
     /// </summary>
-    public async Task<Opportunity> RetrieveAsync(string id, OpportunitiesRetrieveRequest request)
+    public async Task<Opportunity> RetrieveAsync(
+        string id,
+        OpportunitiesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -168,17 +214,31 @@ public async Task<Opportunity> RetrieveAsync(string id, OpportunitiesRetrieveReq
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/opportunities/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Opportunity>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Opportunity>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -186,7 +246,8 @@ public async Task<Opportunity> RetrieveAsync(string id, OpportunitiesRetrieveReq
     /// </summary>
     public async Task<OpportunityResponse> PartialUpdateAsync(
         string id,
-        PatchedOpportunityEndpointRequest request
+        PatchedOpportunityEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -201,64 +262,110 @@ PatchedOpportunityEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"crm/v1/opportunities/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<OpportunityResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<OpportunityResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Opportunity` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"crm/v1/opportunities/meta/patch/{id}"
+                Path = $"crm/v1/opportunities/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Opportunity` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/opportunities/meta/post"
+                Path = "crm/v1/opportunities/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        OpportunitiesRemoteFieldClassesListRequest request
+        OpportunitiesRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -289,16 +396,30 @@ OpportunitiesRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/opportunities/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesListRequest.cs b/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesListRequest.cs
index f4549937..476cf2c5 100644
--- a/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesListRequest.cs
+++ b/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesListRequest.cs
@@ -1,95 +1,91 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class OpportunitiesListRequest
+public record OpportunitiesListRequest
 {
     /// <summary>
     /// If provided, will only return opportunities with this account.
     /// </summary>
-    public string? AccountId { get; init; }
+    public string? AccountId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public OpportunitiesListRequestExpand? Expand { get; init; }
+    public OpportunitiesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return opportunities with this owner.
     /// </summary>
-    public string? OwnerId { get; init; }
+    public string? OwnerId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return opportunities created in the third party platform after this datetime.
     /// </summary>
-    public DateTime? RemoteCreatedAfter { get; init; }
+    public DateTime? RemoteCreatedAfter { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return opportunities with this stage.
     /// </summary>
-    public string? StageId { get; init; }
+    public string? StageId { get; set; }
 
     /// <summary>
     /// If provided, will only return opportunities with this status. Options: ('OPEN', 'WON', 'LOST')
@@ -98,5 +94,5 @@ public class OpportunitiesListRequest
     /// - `WON` - WON
     /// - `LOST` - LOST
     /// </summary>
-    public OpportunitiesListRequestStatus? Status { get; init; }
+    public OpportunitiesListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesRemoteFieldClassesListRequest.cs
index ef5c5639..4899527a 100644
--- a/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class OpportunitiesRemoteFieldClassesListRequest
+public record OpportunitiesRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesRetrieveRequest.cs b/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesRetrieveRequest.cs
index 656fc27f..ca245b52 100644
--- a/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Opportunities/Requests/OpportunitiesRetrieveRequest.cs
@@ -1,33 +1,29 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class OpportunitiesRetrieveRequest
+public record OpportunitiesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public OpportunitiesRetrieveRequestExpand? Expand { get; init; }
+    public OpportunitiesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Opportunities/Requests/OpportunityEndpointRequest.cs b/src/Merge.Client/Crm/Opportunities/Requests/OpportunityEndpointRequest.cs
index 2121a67f..afcfa0d8 100644
--- a/src/Merge.Client/Crm/Opportunities/Requests/OpportunityEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Opportunities/Requests/OpportunityEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class OpportunityEndpointRequest
+public record OpportunityEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public OpportunityRequest Model { get; init; }
+    public required OpportunityRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Opportunities/Requests/PatchedOpportunityEndpointRequest.cs b/src/Merge.Client/Crm/Opportunities/Requests/PatchedOpportunityEndpointRequest.cs
index 7fd8ded7..4b826b00 100644
--- a/src/Merge.Client/Crm/Opportunities/Requests/PatchedOpportunityEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Opportunities/Requests/PatchedOpportunityEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class PatchedOpportunityEndpointRequest
+public record PatchedOpportunityEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PatchedOpportunityRequest Model { get; init; }
+    public required PatchedOpportunityRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesListRequestExpand.cs b/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesListRequestExpand.cs
index 395e222f..c96938a3 100644
--- a/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesListRequestExpand.cs
+++ b/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesListRequestStatus.cs b/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesListRequestStatus.cs
index 0ff1584a..c620ff53 100644
--- a/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesListRequestStatus.cs
+++ b/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesListRequestStatus.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesRetrieveRequestExpand.cs b/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesRetrieveRequestExpand.cs
index b755a284..ada5ae6d 100644
--- a/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Crm/Opportunities/Types/OpportunitiesRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Passthrough/PassthroughClient.cs b/src/Merge.Client/Crm/Passthrough/PassthroughClient.cs
index 77fb0bdc..31018700 100644
--- a/src/Merge.Client/Crm/Passthrough/PassthroughClient.cs
+++ b/src/Merge.Client/Crm/Passthrough/PassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public PassthroughClient(RawClient client)
     /// <summary>
     /// Pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<RemoteResponse> CreateAsync(DataPassthroughRequest request)
+    public async Task<RemoteResponse> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/RegenerateKey/RegenerateKeyClient.cs b/src/Merge.Client/Crm/RegenerateKey/RegenerateKeyClient.cs
index e6c7e9e5..01540c05 100644
--- a/src/Merge.Client/Crm/RegenerateKey/RegenerateKeyClient.cs
+++ b/src/Merge.Client/Crm/RegenerateKey/RegenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public RegenerateKeyClient(RawClient client)
     /// <summary>
     /// Exchange remote keys.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(RemoteKeyForRegenerationRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        RemoteKeyForRegenerationRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/regenerate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs b/src/Merge.Client/Crm/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
index 9d647d80..67d03c60 100644
--- a/src/Merge.Client/Crm/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
+++ b/src/Merge.Client/Crm/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class RemoteKeyForRegenerationRequest
+public record RemoteKeyForRegenerationRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Crm/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
index f28b71ec..2588b28f 100644
--- a/src/Merge.Client/Crm/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Crm/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class LinkedAccountCommonModelScopeDeserializerRequest
+public record LinkedAccountCommonModelScopeDeserializerRequest
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializerRequest>();
 }
diff --git a/src/Merge.Client/Crm/Scopes/ScopesClient.cs b/src/Merge.Client/Crm/Scopes/ScopesClient.cs
index f27066d4..c9041696 100644
--- a/src/Merge.Client/Crm/Scopes/ScopesClient.cs
+++ b/src/Merge.Client/Crm/Scopes/ScopesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,59 +18,110 @@ public ScopesClient(RawClient client)
     /// <summary>
     /// Get the default permissions for Merge Common Models and fields across all Linked Accounts of a given category. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = "crm/v1/default-scopes" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = "crm/v1/default-scopes",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all available permissions for Merge Common Models and fields for a single Linked Account. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/linked-account-scopes"
+                Path = "crm/v1/linked-account-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Update permissions for any Common Model or field for a single Linked Account. Any Scopes not set in this POST request will inherit the default Scopes. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes)
     /// </summary>
     public async Task<CommonModelScopeApi> LinkedAccountScopesCreateAsync(
-        LinkedAccountCommonModelScopeDeserializerRequest request
+        LinkedAccountCommonModelScopeDeserializerRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/linked-account-scopes",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Stages/Requests/StagesListRequest.cs b/src/Merge.Client/Crm/Stages/Requests/StagesListRequest.cs
index 0b1bc4bc..d38aec75 100644
--- a/src/Merge.Client/Crm/Stages/Requests/StagesListRequest.cs
+++ b/src/Merge.Client/Crm/Stages/Requests/StagesListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Crm;
 
-public class StagesListRequest
+public record StagesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Stages/Requests/StagesRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Stages/Requests/StagesRemoteFieldClassesListRequest.cs
index e1ef0585..93eca83d 100644
--- a/src/Merge.Client/Crm/Stages/Requests/StagesRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Stages/Requests/StagesRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class StagesRemoteFieldClassesListRequest
+public record StagesRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Stages/Requests/StagesRetrieveRequest.cs b/src/Merge.Client/Crm/Stages/Requests/StagesRetrieveRequest.cs
index 83d94c9a..192a393b 100644
--- a/src/Merge.Client/Crm/Stages/Requests/StagesRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Stages/Requests/StagesRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class StagesRetrieveRequest
+public record StagesRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Stages/StagesClient.cs b/src/Merge.Client/Crm/Stages/StagesClient.cs
index 065500dc..8ed17c2a 100644
--- a/src/Merge.Client/Crm/Stages/StagesClient.cs
+++ b/src/Merge.Client/Crm/Stages/StagesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public StagesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Stage` objects.
     /// </summary>
-    public async Task<PaginatedStageList> ListAsync(StagesListRequest request)
+    public async Task<PaginatedStageList> ListAsync(
+        StagesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedStageList> ListAsync(StagesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -64,23 +73,41 @@ public async Task<PaginatedStageList> ListAsync(StagesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/stages",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedStageList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedStageList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Stage` object with the given `id`.
     /// </summary>
-    public async Task<Stage> RetrieveAsync(string id, StagesRetrieveRequest request)
+    public async Task<Stage> RetrieveAsync(
+        string id,
+        StagesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -94,24 +121,39 @@ public async Task<Stage> RetrieveAsync(string id, StagesRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/stages/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Stage>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Stage>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        StagesRemoteFieldClassesListRequest request
+        StagesRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -142,16 +184,30 @@ StagesRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/stages/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/SyncStatus/Requests/SyncStatusListRequest.cs b/src/Merge.Client/Crm/SyncStatus/Requests/SyncStatusListRequest.cs
index 283ec694..7b112636 100644
--- a/src/Merge.Client/Crm/SyncStatus/Requests/SyncStatusListRequest.cs
+++ b/src/Merge.Client/Crm/SyncStatus/Requests/SyncStatusListRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class SyncStatusListRequest
+public record SyncStatusListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/SyncStatus/SyncStatusClient.cs b/src/Merge.Client/Crm/SyncStatus/SyncStatusClient.cs
index bfdd76e4..094d2b55 100644
--- a/src/Merge.Client/Crm/SyncStatus/SyncStatusClient.cs
+++ b/src/Merge.Client/Crm/SyncStatus/SyncStatusClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public SyncStatusClient(RawClient client)
     /// <summary>
     /// Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `PARTIALLY_SYNCED`, `PAUSED`, `SYNCING`. Learn more about sync status in our [Help Center](https://help.merge.dev/en/articles/8184193-merge-sync-statuses).
     /// </summary>
-    public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest request)
+    public async Task<PaginatedSyncStatusList> ListAsync(
+        SyncStatusListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -32,16 +35,30 @@ public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest reque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/sync-status",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedSyncStatusList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedSyncStatusList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Tasks/Requests/PatchedTaskEndpointRequest.cs b/src/Merge.Client/Crm/Tasks/Requests/PatchedTaskEndpointRequest.cs
index a4318c8c..8020bde6 100644
--- a/src/Merge.Client/Crm/Tasks/Requests/PatchedTaskEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Tasks/Requests/PatchedTaskEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class PatchedTaskEndpointRequest
+public record PatchedTaskEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PatchedTaskRequest Model { get; init; }
+    public required PatchedTaskRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Tasks/Requests/TaskEndpointRequest.cs b/src/Merge.Client/Crm/Tasks/Requests/TaskEndpointRequest.cs
index f324d8a2..56f20535 100644
--- a/src/Merge.Client/Crm/Tasks/Requests/TaskEndpointRequest.cs
+++ b/src/Merge.Client/Crm/Tasks/Requests/TaskEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class TaskEndpointRequest
+public record TaskEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public TaskRequest Model { get; init; }
+    public required TaskRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Tasks/Requests/TasksListRequest.cs b/src/Merge.Client/Crm/Tasks/Requests/TasksListRequest.cs
index 67ebbd8d..3ce1eb91 100644
--- a/src/Merge.Client/Crm/Tasks/Requests/TasksListRequest.cs
+++ b/src/Merge.Client/Crm/Tasks/Requests/TasksListRequest.cs
@@ -1,63 +1,59 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class TasksListRequest
+public record TasksListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TasksListRequestExpand? Expand { get; init; }
+    public TasksListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Tasks/Requests/TasksRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Tasks/Requests/TasksRemoteFieldClassesListRequest.cs
index fcfea338..49cf2826 100644
--- a/src/Merge.Client/Crm/Tasks/Requests/TasksRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Tasks/Requests/TasksRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class TasksRemoteFieldClassesListRequest
+public record TasksRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Tasks/Requests/TasksRetrieveRequest.cs b/src/Merge.Client/Crm/Tasks/Requests/TasksRetrieveRequest.cs
index 18a20dff..017bd774 100644
--- a/src/Merge.Client/Crm/Tasks/Requests/TasksRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Tasks/Requests/TasksRetrieveRequest.cs
@@ -1,23 +1,19 @@
-using Merge.Client.Crm;
-
-#nullable enable
-
 namespace Merge.Client.Crm;
 
-public class TasksRetrieveRequest
+public record TasksRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TasksRetrieveRequestExpand? Expand { get; init; }
+    public TasksRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Tasks/TasksClient.cs b/src/Merge.Client/Crm/Tasks/TasksClient.cs
index 701b3d32..c9589f31 100644
--- a/src/Merge.Client/Crm/Tasks/TasksClient.cs
+++ b/src/Merge.Client/Crm/Tasks/TasksClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public TasksClient(RawClient client)
     /// <summary>
     /// Returns a list of `Task` objects.
     /// </summary>
-    public async Task<PaginatedTaskList> ListAsync(TasksListRequest request)
+    public async Task<PaginatedTaskList> ListAsync(
+        TasksListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedTaskList> ListAsync(TasksListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -68,23 +77,40 @@ public async Task<PaginatedTaskList> ListAsync(TasksListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/tasks",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTaskList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTaskList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Task` object with the given values.
     /// </summary>
-    public async Task<TaskResponse> CreateAsync(TaskEndpointRequest request)
+    public async Task<TaskResponse> CreateAsync(
+        TaskEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -98,23 +124,41 @@ public async Task<TaskResponse> CreateAsync(TaskEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/tasks",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TaskResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TaskResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Task` object with the given `id`.
     /// </summary>
-    public async Task<Task> RetrieveAsync(string id, TasksRetrieveRequest request)
+    public async Task<Task> RetrieveAsync(
+        string id,
+        TasksRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -132,17 +176,31 @@ public async Task<Task> RetrieveAsync(string id, TasksRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/tasks/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Task>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Task>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -150,7 +208,8 @@ public async Task<Task> RetrieveAsync(string id, TasksRetrieveRequest request)
     /// </summary>
     public async Task<TaskResponse> PartialUpdateAsync(
         string id,
-        PatchedTaskEndpointRequest request
+        PatchedTaskEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -165,64 +224,110 @@ PatchedTaskEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"crm/v1/tasks/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TaskResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TaskResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Task` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"crm/v1/tasks/meta/patch/{id}"
+                Path = $"crm/v1/tasks/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Task` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/tasks/meta/post"
+                Path = "crm/v1/tasks/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        TasksRemoteFieldClassesListRequest request
+        TasksRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -253,16 +358,30 @@ TasksRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/tasks/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/Tasks/Types/TasksListRequestExpand.cs b/src/Merge.Client/Crm/Tasks/Types/TasksListRequestExpand.cs
index 0db96509..d8954715 100644
--- a/src/Merge.Client/Crm/Tasks/Types/TasksListRequestExpand.cs
+++ b/src/Merge.Client/Crm/Tasks/Types/TasksListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Tasks/Types/TasksRetrieveRequestExpand.cs b/src/Merge.Client/Crm/Tasks/Types/TasksRetrieveRequestExpand.cs
index 55cc68bf..80bfc9aa 100644
--- a/src/Merge.Client/Crm/Tasks/Types/TasksRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Crm/Tasks/Types/TasksRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/Account.cs b/src/Merge.Client/Crm/Types/Account.cs
index c6e22643..3f6c6479 100644
--- a/src/Merge.Client/Crm/Types/Account.cs
+++ b/src/Merge.Client/Crm/Types/Account.cs
@@ -1,105 +1,104 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Account
+public record Account
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The account's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The account's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The account's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The account's industry.
     /// </summary>
     [JsonPropertyName("industry")]
-    public string? Industry { get; init; }
+    public string? Industry { get; set; }
 
     /// <summary>
     /// The account's website.
     /// </summary>
     [JsonPropertyName("website")]
-    public string? Website { get; init; }
+    public string? Website { get; set; }
 
     /// <summary>
     /// The account's number of employees.
     /// </summary>
     [JsonPropertyName("number_of_employees")]
-    public int? NumberOfEmployees { get; init; }
+    public int? NumberOfEmployees { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<Address>? Addresses { get; init; }
+    public IEnumerable<Address>? Addresses { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumber>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumber>? PhoneNumbers { get; set; }
 
     /// <summary>
     /// The last date (either most recent or furthest in the future) of when an activity occurs in an account.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     /// <summary>
     /// When the CRM system account data was last modified by a user with a login.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// When the third party's account was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AccountDetails.cs b/src/Merge.Client/Crm/Types/AccountDetails.cs
index 7d67acae..88d8be14 100644
--- a/src/Merge.Client/Crm/Types/AccountDetails.cs
+++ b/src/Merge.Client/Crm/Types/AccountDetails.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AccountDetails
+public record AccountDetails
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     [JsonPropertyName("integration_slug")]
-    public string? IntegrationSlug { get; init; }
+    public string? IntegrationSlug { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     [JsonPropertyName("status")]
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string? WebhookListenerUrl { get; init; }
+    public string? WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string? AccountType { get; init; }
+    public string? AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AccountDetailsAndActions.cs b/src/Merge.Client/Crm/Types/AccountDetailsAndActions.cs
index 01ddcd78..4360f8fb 100644
--- a/src/Merge.Client/Crm/Types/AccountDetailsAndActions.cs
+++ b/src/Merge.Client/Crm/Types/AccountDetailsAndActions.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AccountDetailsAndActions
+public record AccountDetailsAndActions
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("status")]
-    public AccountDetailsAndActionsStatusEnum Status { get; init; }
+    public required AccountDetailsAndActionsStatusEnum Status { get; set; }
 
     [JsonPropertyName("status_detail")]
-    public string? StatusDetail { get; init; }
+    public string? StatusDetail { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// The tenant or domain the customer has provided access to.
     /// </summary>
     [JsonPropertyName("subdomain")]
-    public string? Subdomain { get; init; }
+    public string? Subdomain { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string WebhookListenerUrl { get; init; }
+    public required string WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountDetailsAndActionsIntegration? Integration { get; init; }
+    public AccountDetailsAndActionsIntegration? Integration { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string AccountType { get; init; }
+    public required string AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AccountDetailsAndActionsIntegration.cs b/src/Merge.Client/Crm/Types/AccountDetailsAndActionsIntegration.cs
index b7f468d6..1aadbdea 100644
--- a/src/Merge.Client/Crm/Types/AccountDetailsAndActionsIntegration.cs
+++ b/src/Merge.Client/Crm/Types/AccountDetailsAndActionsIntegration.cs
@@ -1,33 +1,32 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AccountDetailsAndActionsIntegration
+public record AccountDetailsAndActionsIntegration
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     [JsonPropertyName("color")]
-    public string Color { get; init; }
+    public required string Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string Slug { get; init; }
+    public required string Slug { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AccountDetailsAndActionsStatusEnum.cs b/src/Merge.Client/Crm/Types/AccountDetailsAndActionsStatusEnum.cs
index 78f8d1b7..9425de58 100644
--- a/src/Merge.Client/Crm/Types/AccountDetailsAndActionsStatusEnum.cs
+++ b/src/Merge.Client/Crm/Types/AccountDetailsAndActionsStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/AccountIntegration.cs b/src/Merge.Client/Crm/Types/AccountIntegration.cs
index b97b316d..eca07914 100644
--- a/src/Merge.Client/Crm/Types/AccountIntegration.cs
+++ b/src/Merge.Client/Crm/Types/AccountIntegration.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AccountIntegration
+public record AccountIntegration
 {
     /// <summary>
     /// Company name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// Optional. This shortened name appears in places with limited space, usually in conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example: <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP SuccessFactors)</i>
     /// </summary>
     [JsonPropertyName("abbreviated_name")]
-    public string? AbbreviatedName { get; init; }
+    public string? AbbreviatedName { get; set; }
 
     /// <summary>
     /// Category or categories this integration belongs to. Multiple categories should be comma separated, i.e. [ats, hris].
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum>? Categories { get; init; }
+    public IEnumerable<CategoriesEnum>? Categories { get; set; }
 
     /// <summary>
     /// Company logo in rectangular shape. <b>Upload an image with a clear background.</b>
     /// </summary>
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     /// <summary>
     /// Company logo in square shape. <b>Upload an image with a white background.</b>
     /// </summary>
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     /// <summary>
     /// The color of this integration used for buttons and text throughout the app and landing pages. <b>Choose a darker, saturated color.</b>
     /// </summary>
     [JsonPropertyName("color")]
-    public string? Color { get; init; }
+    public string? Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string? Slug { get; init; }
+    public string? Slug { get; set; }
 
     /// <summary>
     /// Mapping of API endpoints to documentation urls for support. Example: {'GET': [['/common-model-scopes', 'https://docs.merge.dev/accounting/common-model-scopes/#common_model_scopes_retrieve'],['/common-model-actions', 'https://docs.merge.dev/accounting/common-model-actions/#common_model_actions_retrieve']], 'POST': []}
     /// </summary>
     [JsonPropertyName("api_endpoints_to_documentation_urls")]
-    public Dictionary<string, object>? ApiEndpointsToDocumentationUrls { get; init; }
+    public Dictionary<string, object?>? ApiEndpointsToDocumentationUrls { get; set; }
 
     /// <summary>
     /// Setup guide URL for third party webhook creation. Exposed in Merge Docs.
     /// </summary>
     [JsonPropertyName("webhook_setup_guide_url")]
-    public string? WebhookSetupGuideUrl { get; init; }
+    public string? WebhookSetupGuideUrl { get; set; }
 
     /// <summary>
     /// Category or categories this integration is in beta status for.
     /// </summary>
     [JsonPropertyName("category_beta_status")]
-    public Dictionary<string, object>? CategoryBetaStatus { get; init; }
+    public Dictionary<string, object?>? CategoryBetaStatus { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AccountRequest.cs b/src/Merge.Client/Crm/Types/AccountRequest.cs
index b02fe182..f7a441a2 100644
--- a/src/Merge.Client/Crm/Types/AccountRequest.cs
+++ b/src/Merge.Client/Crm/Types/AccountRequest.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AccountRequest
+public record AccountRequest
 {
     /// <summary>
     /// The account's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The account's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The account's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The account's industry.
     /// </summary>
     [JsonPropertyName("industry")]
-    public string? Industry { get; init; }
+    public string? Industry { get; set; }
 
     /// <summary>
     /// The account's website.
     /// </summary>
     [JsonPropertyName("website")]
-    public string? Website { get; init; }
+    public string? Website { get; set; }
 
     /// <summary>
     /// The account's number of employees.
     /// </summary>
     [JsonPropertyName("number_of_employees")]
-    public int? NumberOfEmployees { get; init; }
+    public int? NumberOfEmployees { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<AddressRequest>? Addresses { get; init; }
+    public IEnumerable<AddressRequest>? Addresses { get; set; }
 
     /// <summary>
     /// The last date (either most recent or furthest in the future) of when an activity occurs in an account.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AccountToken.cs b/src/Merge.Client/Crm/Types/AccountToken.cs
index c0ec11e5..60a322c7 100644
--- a/src/Merge.Client/Crm/Types/AccountToken.cs
+++ b/src/Merge.Client/Crm/Types/AccountToken.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AccountToken
+public record AccountToken
 {
     [JsonPropertyName("account_token")]
-    public string AccountToken_ { get; init; }
+    public required string AccountToken_ { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ActivityTypeEnum.cs b/src/Merge.Client/Crm/Types/ActivityTypeEnum.cs
index 23f0d2bf..2fbcd997 100644
--- a/src/Merge.Client/Crm/Types/ActivityTypeEnum.cs
+++ b/src/Merge.Client/Crm/Types/ActivityTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/Address.cs b/src/Merge.Client/Crm/Types/Address.cs
index c6033a19..c3a57603 100644
--- a/src/Merge.Client/Crm/Types/Address.cs
+++ b/src/Merge.Client/Crm/Types/Address.cs
@@ -1,53 +1,52 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Address
+public record Address
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// Line 1 of the address's street.
     /// </summary>
     [JsonPropertyName("street_1")]
-    public string? Street1 { get; init; }
+    public string? Street1 { get; set; }
 
     /// <summary>
     /// Line 2 of the address's street.
     /// </summary>
     [JsonPropertyName("street_2")]
-    public string? Street2 { get; init; }
+    public string? Street2 { get; set; }
 
     /// <summary>
     /// The address's city.
     /// </summary>
     [JsonPropertyName("city")]
-    public string? City { get; init; }
+    public string? City { get; set; }
 
     /// <summary>
     /// The address's state.
     /// </summary>
     [JsonPropertyName("state")]
-    public string? State { get; init; }
+    public string? State { get; set; }
 
     /// <summary>
     /// The address's postal code.
     /// </summary>
     [JsonPropertyName("postal_code")]
-    public string? PostalCode { get; init; }
+    public string? PostalCode { get; set; }
 
     /// <summary>
     /// The address's country.
@@ -303,7 +302,7 @@ public class Address
     /// - `ZW` - Zimbabwe
     /// </summary>
     [JsonPropertyName("country")]
-    public CountryEnum? Country { get; init; }
+    public CountryEnum? Country { get; set; }
 
     /// <summary>
     /// The address type.
@@ -312,5 +311,5 @@ public class Address
     /// - `SHIPPING` - SHIPPING
     /// </summary>
     [JsonPropertyName("address_type")]
-    public AddressTypeEnum? AddressType { get; init; }
+    public AddressTypeEnum? AddressType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AddressRequest.cs b/src/Merge.Client/Crm/Types/AddressRequest.cs
index 8038ff4a..210e6f05 100644
--- a/src/Merge.Client/Crm/Types/AddressRequest.cs
+++ b/src/Merge.Client/Crm/Types/AddressRequest.cs
@@ -1,41 +1,40 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AddressRequest
+public record AddressRequest
 {
     /// <summary>
     /// Line 1 of the address's street.
     /// </summary>
     [JsonPropertyName("street_1")]
-    public string? Street1 { get; init; }
+    public string? Street1 { get; set; }
 
     /// <summary>
     /// Line 2 of the address's street.
     /// </summary>
     [JsonPropertyName("street_2")]
-    public string? Street2 { get; init; }
+    public string? Street2 { get; set; }
 
     /// <summary>
     /// The address's city.
     /// </summary>
     [JsonPropertyName("city")]
-    public string? City { get; init; }
+    public string? City { get; set; }
 
     /// <summary>
     /// The address's state.
     /// </summary>
     [JsonPropertyName("state")]
-    public string? State { get; init; }
+    public string? State { get; set; }
 
     /// <summary>
     /// The address's postal code.
     /// </summary>
     [JsonPropertyName("postal_code")]
-    public string? PostalCode { get; init; }
+    public string? PostalCode { get; set; }
 
     /// <summary>
     /// The address's country.
@@ -291,7 +290,7 @@ public class AddressRequest
     /// - `ZW` - Zimbabwe
     /// </summary>
     [JsonPropertyName("country")]
-    public CountryEnum? Country { get; init; }
+    public CountryEnum? Country { get; set; }
 
     /// <summary>
     /// The address type.
@@ -300,11 +299,11 @@ public class AddressRequest
     /// - `SHIPPING` - SHIPPING
     /// </summary>
     [JsonPropertyName("address_type")]
-    public AddressTypeEnum? AddressType { get; init; }
+    public AddressTypeEnum? AddressType { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AddressTypeEnum.cs b/src/Merge.Client/Crm/Types/AddressTypeEnum.cs
index b2f5b9a0..2b8419c7 100644
--- a/src/Merge.Client/Crm/Types/AddressTypeEnum.cs
+++ b/src/Merge.Client/Crm/Types/AddressTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/AdvancedMetadata.cs b/src/Merge.Client/Crm/Types/AdvancedMetadata.cs
index 035e2761..d155abd1 100644
--- a/src/Merge.Client/Crm/Types/AdvancedMetadata.cs
+++ b/src/Merge.Client/Crm/Types/AdvancedMetadata.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Crm;
 
-public class AdvancedMetadata
+public record AdvancedMetadata
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("is_custom")]
-    public bool? IsCustom { get; init; }
+    public bool? IsCustom { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<object>? FieldChoices { get; init; }
+    public IEnumerable<object>? FieldChoices { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/Association.cs b/src/Merge.Client/Crm/Types/Association.cs
index bfd924a7..d95d4448 100644
--- a/src/Merge.Client/Crm/Types/Association.cs
+++ b/src/Merge.Client/Crm/Types/Association.cs
@@ -1,36 +1,35 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Association
+public record Association
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("source_object")]
-    public string? SourceObject { get; init; }
+    public string? SourceObject { get; set; }
 
     [JsonPropertyName("target_object")]
-    public string? TargetObject { get; init; }
+    public string? TargetObject { get; set; }
 
     /// <summary>
     /// The association type the association belongs to.
     /// </summary>
     [JsonPropertyName("association_type")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, AssociationType>>))]
-    public OneOf<string, AssociationType>? AssociationType { get; init; }
+    public OneOf<string, AssociationType>? AssociationType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AssociationSubType.cs b/src/Merge.Client/Crm/Types/AssociationSubType.cs
index 6aa577a5..04fc48e4 100644
--- a/src/Merge.Client/Crm/Types/AssociationSubType.cs
+++ b/src/Merge.Client/Crm/Types/AssociationSubType.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Crm;
 
-public class AssociationSubType
+public record AssociationSubType
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("origin_type")]
-    public string? OriginType { get; init; }
+    public string? OriginType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AssociationType.cs b/src/Merge.Client/Crm/Types/AssociationType.cs
index 824333d4..04a2ce34 100644
--- a/src/Merge.Client/Crm/Types/AssociationType.cs
+++ b/src/Merge.Client/Crm/Types/AssociationType.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AssociationType
+public record AssociationType
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The class of the source object (Custom Object or Common Model) for the association type.
     /// </summary>
     [JsonPropertyName("source_object_class")]
-    public Dictionary<string, object>? SourceObjectClass { get; init; }
+    public Dictionary<string, object?>? SourceObjectClass { get; set; }
 
     [JsonPropertyName("target_object_classes")]
-    public IEnumerable<AssociationSubType>? TargetObjectClasses { get; init; }
+    public IEnumerable<AssociationSubType>? TargetObjectClasses { get; set; }
 
     [JsonPropertyName("remote_key_name")]
-    public string? RemoteKeyName { get; init; }
+    public string? RemoteKeyName { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("cardinality")]
-    public CardinalityEnum? Cardinality { get; init; }
+    public CardinalityEnum? Cardinality { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AssociationTypeRequestRequest.cs b/src/Merge.Client/Crm/Types/AssociationTypeRequestRequest.cs
index be337b53..1c1de489 100644
--- a/src/Merge.Client/Crm/Types/AssociationTypeRequestRequest.cs
+++ b/src/Merge.Client/Crm/Types/AssociationTypeRequestRequest.cs
@@ -1,27 +1,27 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AssociationTypeRequestRequest
+public record AssociationTypeRequestRequest
 {
     [JsonPropertyName("source_object_class")]
-    public ObjectClassDescriptionRequest SourceObjectClass { get; init; }
+    public required ObjectClassDescriptionRequest SourceObjectClass { get; set; }
 
     [JsonPropertyName("target_object_classes")]
-    public IEnumerable<ObjectClassDescriptionRequest> TargetObjectClasses { get; init; }
+    public IEnumerable<ObjectClassDescriptionRequest> TargetObjectClasses { get; set; } =
+        new List<ObjectClassDescriptionRequest>();
 
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("cardinality")]
-    public CardinalityEnum? Cardinality { get; init; }
+    public CardinalityEnum? Cardinality { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AsyncPassthroughReciept.cs b/src/Merge.Client/Crm/Types/AsyncPassthroughReciept.cs
index bbe81d2f..014c77fa 100644
--- a/src/Merge.Client/Crm/Types/AsyncPassthroughReciept.cs
+++ b/src/Merge.Client/Crm/Types/AsyncPassthroughReciept.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Crm;
 
-public class AsyncPassthroughReciept
+public record AsyncPassthroughReciept
 {
     [JsonPropertyName("async_passthrough_receipt_id")]
-    public string AsyncPassthroughReceiptId { get; init; }
+    public required string AsyncPassthroughReceiptId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AuditLogEvent.cs b/src/Merge.Client/Crm/Types/AuditLogEvent.cs
index 9a06fccc..0030f088 100644
--- a/src/Merge.Client/Crm/Types/AuditLogEvent.cs
+++ b/src/Merge.Client/Crm/Types/AuditLogEvent.cs
@@ -1,26 +1,25 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AuditLogEvent
+public record AuditLogEvent
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The User's full name at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_name")]
-    public string? UserName { get; init; }
+    public string? UserName { get; set; }
 
     /// <summary>
     /// The User's email at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_email")]
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 
     /// <summary>
     /// Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.
@@ -33,10 +32,10 @@ public class AuditLogEvent
     /// - `MERGE_TEAM` - MERGE_TEAM
     /// </summary>
     [JsonPropertyName("role")]
-    public RoleEnum Role { get; init; }
+    public required RoleEnum Role { get; set; }
 
     [JsonPropertyName("ip_address")]
-    public string IpAddress { get; init; }
+    public required string IpAddress { get; set; }
 
     /// <summary>
     /// Designates the type of event that occurred.
@@ -81,11 +80,11 @@ public class AuditLogEvent
     /// - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
     /// </summary>
     [JsonPropertyName("event_type")]
-    public EventTypeEnum EventType { get; init; }
+    public required EventTypeEnum EventType { get; set; }
 
     [JsonPropertyName("event_description")]
-    public string EventDescription { get; init; }
+    public required string EventDescription { get; set; }
 
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/AvailableActions.cs b/src/Merge.Client/Crm/Types/AvailableActions.cs
index 124635fd..02339150 100644
--- a/src/Merge.Client/Crm/Types/AvailableActions.cs
+++ b/src/Merge.Client/Crm/Types/AvailableActions.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class AvailableActions
+public record AvailableActions
 {
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/CardinalityEnum.cs b/src/Merge.Client/Crm/Types/CardinalityEnum.cs
index 989949d5..b35778e0 100644
--- a/src/Merge.Client/Crm/Types/CardinalityEnum.cs
+++ b/src/Merge.Client/Crm/Types/CardinalityEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/CategoriesEnum.cs b/src/Merge.Client/Crm/Types/CategoriesEnum.cs
index e8aa0b70..e8f7508c 100644
--- a/src/Merge.Client/Crm/Types/CategoriesEnum.cs
+++ b/src/Merge.Client/Crm/Types/CategoriesEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/CategoryEnum.cs b/src/Merge.Client/Crm/Types/CategoryEnum.cs
index b5b5f861..ad050f11 100644
--- a/src/Merge.Client/Crm/Types/CategoryEnum.cs
+++ b/src/Merge.Client/Crm/Types/CategoryEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/CommonModelScopeApi.cs b/src/Merge.Client/Crm/Types/CommonModelScopeApi.cs
index 4c4fe8f0..5f5765c9 100644
--- a/src/Merge.Client/Crm/Types/CommonModelScopeApi.cs
+++ b/src/Merge.Client/Crm/Types/CommonModelScopeApi.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class CommonModelScopeApi
+public record CommonModelScopeApi
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializer>();
 }
diff --git a/src/Merge.Client/Crm/Types/CommonModelScopesBodyRequest.cs b/src/Merge.Client/Crm/Types/CommonModelScopesBodyRequest.cs
index 7e05b148..b07dedd0 100644
--- a/src/Merge.Client/Crm/Types/CommonModelScopesBodyRequest.cs
+++ b/src/Merge.Client/Crm/Types/CommonModelScopesBodyRequest.cs
@@ -1,18 +1,18 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class CommonModelScopesBodyRequest
+public record CommonModelScopesBodyRequest
 {
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("enabled_actions")]
-    public IEnumerable<EnabledActionsEnum> EnabledActions { get; init; }
+    public IEnumerable<EnabledActionsEnum> EnabledActions { get; set; } =
+        new List<EnabledActionsEnum>();
 
     [JsonPropertyName("disabled_fields")]
-    public IEnumerable<string> DisabledFields { get; init; }
+    public IEnumerable<string> DisabledFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Crm/Types/Contact.cs b/src/Merge.Client/Crm/Types/Contact.cs
index bf7c3ded..7ce7d91a 100644
--- a/src/Merge.Client/Crm/Types/Contact.cs
+++ b/src/Merge.Client/Crm/Types/Contact.cs
@@ -1,91 +1,90 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Contact
+public record Contact
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The contact's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The contact's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The contact's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The contact's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<Address>? Addresses { get; init; }
+    public IEnumerable<Address>? Addresses { get; set; }
 
     [JsonPropertyName("email_addresses")]
-    public IEnumerable<EmailAddress>? EmailAddresses { get; init; }
+    public IEnumerable<EmailAddress>? EmailAddresses { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumber>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumber>? PhoneNumbers { get; set; }
 
     /// <summary>
     /// When the contact's last activity occurred.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     /// <summary>
     /// When the third party's contact was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ContactRequest.cs b/src/Merge.Client/Crm/Types/ContactRequest.cs
index 9e763aeb..7da085c3 100644
--- a/src/Merge.Client/Crm/Types/ContactRequest.cs
+++ b/src/Merge.Client/Crm/Types/ContactRequest.cs
@@ -1,61 +1,60 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class ContactRequest
+public record ContactRequest
 {
     /// <summary>
     /// The contact's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The contact's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The contact's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The contact's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<AddressRequest>? Addresses { get; init; }
+    public IEnumerable<AddressRequest>? Addresses { get; set; }
 
     [JsonPropertyName("email_addresses")]
-    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; init; }
+    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; set; }
 
     /// <summary>
     /// When the contact's last activity occurred.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/CountryEnum.cs b/src/Merge.Client/Crm/Types/CountryEnum.cs
index c4023cbc..e400fd30 100644
--- a/src/Merge.Client/Crm/Types/CountryEnum.cs
+++ b/src/Merge.Client/Crm/Types/CountryEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/CrmAccountResponse.cs b/src/Merge.Client/Crm/Types/CrmAccountResponse.cs
index 576f7efb..d57b0326 100644
--- a/src/Merge.Client/Crm/Types/CrmAccountResponse.cs
+++ b/src/Merge.Client/Crm/Types/CrmAccountResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class CrmAccountResponse
+public record CrmAccountResponse
 {
     [JsonPropertyName("model")]
-    public Account Model { get; init; }
+    public required Account Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/CrmAssociationTypeResponse.cs b/src/Merge.Client/Crm/Types/CrmAssociationTypeResponse.cs
index 18537d40..40e0e0dc 100644
--- a/src/Merge.Client/Crm/Types/CrmAssociationTypeResponse.cs
+++ b/src/Merge.Client/Crm/Types/CrmAssociationTypeResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class CrmAssociationTypeResponse
+public record CrmAssociationTypeResponse
 {
     [JsonPropertyName("model")]
-    public AssociationType Model { get; init; }
+    public required AssociationType Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/CrmContactResponse.cs b/src/Merge.Client/Crm/Types/CrmContactResponse.cs
index 4c61af17..0c4647fe 100644
--- a/src/Merge.Client/Crm/Types/CrmContactResponse.cs
+++ b/src/Merge.Client/Crm/Types/CrmContactResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class CrmContactResponse
+public record CrmContactResponse
 {
     [JsonPropertyName("model")]
-    public Contact Model { get; init; }
+    public required Contact Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/CrmCustomObjectResponse.cs b/src/Merge.Client/Crm/Types/CrmCustomObjectResponse.cs
index 51619d98..779d162d 100644
--- a/src/Merge.Client/Crm/Types/CrmCustomObjectResponse.cs
+++ b/src/Merge.Client/Crm/Types/CrmCustomObjectResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class CrmCustomObjectResponse
+public record CrmCustomObjectResponse
 {
     [JsonPropertyName("model")]
-    public CustomObject Model { get; init; }
+    public required CustomObject Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/CustomObject.cs b/src/Merge.Client/Crm/Types/CustomObject.cs
index ed7456f9..d1575c43 100644
--- a/src/Merge.Client/Crm/Types/CustomObject.cs
+++ b/src/Merge.Client/Crm/Types/CustomObject.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class CustomObject
+public record CustomObject
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The custom object class the custom object record belongs to.
     /// </summary>
     [JsonPropertyName("object_class")]
-    public string? ObjectClass { get; init; }
+    public string? ObjectClass { get; set; }
 
     /// <summary>
     /// The fields and values contained within the custom object record.
     /// </summary>
     [JsonPropertyName("fields")]
-    public Dictionary<string, object>? Fields { get; init; }
+    public Dictionary<string, object?>? Fields { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/CustomObjectClass.cs b/src/Merge.Client/Crm/Types/CustomObjectClass.cs
index aaefab48..8ac5ba5b 100644
--- a/src/Merge.Client/Crm/Types/CustomObjectClass.cs
+++ b/src/Merge.Client/Crm/Types/CustomObjectClass.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class CustomObjectClass
+public record CustomObjectClass
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The custom object class's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The custom object class's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The custom object class's singular and plural labels.
     /// </summary>
     [JsonPropertyName("labels")]
-    public Dictionary<string, string?>? Labels { get; init; }
+    public Dictionary<string, string?>? Labels { get; set; }
 
     [JsonPropertyName("fields")]
-    public IEnumerable<RemoteFieldClassForCustomObjectClass>? Fields { get; init; }
+    public IEnumerable<RemoteFieldClassForCustomObjectClass>? Fields { get; set; }
 
     /// <summary>
     /// The types of associations with other models that the custom object class can have.
     /// </summary>
     [JsonPropertyName("association_types")]
-    public IEnumerable<Dictionary<string, object>>? AssociationTypes { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? AssociationTypes { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/CustomObjectRequest.cs b/src/Merge.Client/Crm/Types/CustomObjectRequest.cs
index c4fa771d..6e70381c 100644
--- a/src/Merge.Client/Crm/Types/CustomObjectRequest.cs
+++ b/src/Merge.Client/Crm/Types/CustomObjectRequest.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Crm;
 
-public class CustomObjectRequest
+public record CustomObjectRequest
 {
     [JsonPropertyName("fields")]
-    public Dictionary<string, object> Fields { get; init; }
+    public Dictionary<string, object?> Fields { get; set; } = new Dictionary<string, object?>();
 }
diff --git a/src/Merge.Client/Crm/Types/DataPassthroughRequest.cs b/src/Merge.Client/Crm/Types/DataPassthroughRequest.cs
index 5a337575..9e660d0a 100644
--- a/src/Merge.Client/Crm/Types/DataPassthroughRequest.cs
+++ b/src/Merge.Client/Crm/Types/DataPassthroughRequest.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class DataPassthroughRequest
+public record DataPassthroughRequest
 {
     [JsonPropertyName("method")]
-    public MethodEnum Method { get; init; }
+    public required MethodEnum Method { get; set; }
 
     /// <summary>
     /// The path of the request in the third party's platform.
     /// </summary>
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     /// <summary>
     /// An optional override of the third party's base url for the request.
     /// </summary>
     [JsonPropertyName("base_url_override")]
-    public string? BaseUrlOverride { get; init; }
+    public string? BaseUrlOverride { get; set; }
 
     /// <summary>
     /// The data with the request. You must include a `request_format` parameter matching the data's format
     /// </summary>
     [JsonPropertyName("data")]
-    public string? Data { get; init; }
+    public string? Data { get; set; }
 
     /// <summary>
     /// Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`.
     /// </summary>
     [JsonPropertyName("multipart_form_data")]
-    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; init; }
+    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; set; }
 
     /// <summary>
     /// The headers to use for the request (Merge will handle the account's authorization headers). `Content-Type` header is required for passthrough. Choose content type corresponding to expected format of receiving server.
     /// </summary>
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 
     [JsonPropertyName("request_format")]
-    public RequestFormatEnum? RequestFormat { get; init; }
+    public RequestFormatEnum? RequestFormat { get; set; }
 
     /// <summary>
     /// Optional. If true, the response will always be an object of the form `{"type": T, "value": ...}` where `T` will be one of `string, boolean, number, null, array, object`.
     /// </summary>
     [JsonPropertyName("normalize_response")]
-    public bool? NormalizeResponse { get; init; }
+    public bool? NormalizeResponse { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/DebugModeLog.cs b/src/Merge.Client/Crm/Types/DebugModeLog.cs
index 12f540ea..10eec682 100644
--- a/src/Merge.Client/Crm/Types/DebugModeLog.cs
+++ b/src/Merge.Client/Crm/Types/DebugModeLog.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class DebugModeLog
+public record DebugModeLog
 {
     [JsonPropertyName("log_id")]
-    public string LogId { get; init; }
+    public required string LogId { get; set; }
 
     [JsonPropertyName("dashboard_view")]
-    public string DashboardView { get; init; }
+    public required string DashboardView { get; set; }
 
     [JsonPropertyName("log_summary")]
-    public DebugModelLogSummary LogSummary { get; init; }
+    public required DebugModelLogSummary LogSummary { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/DebugModelLogSummary.cs b/src/Merge.Client/Crm/Types/DebugModelLogSummary.cs
index d7013077..7f59e976 100644
--- a/src/Merge.Client/Crm/Types/DebugModelLogSummary.cs
+++ b/src/Merge.Client/Crm/Types/DebugModelLogSummary.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class DebugModelLogSummary
+public record DebugModelLogSummary
 {
     [JsonPropertyName("url")]
-    public string Url { get; init; }
+    public required string Url { get; set; }
 
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("status_code")]
-    public int StatusCode { get; init; }
+    public required int StatusCode { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/DirectionEnum.cs b/src/Merge.Client/Crm/Types/DirectionEnum.cs
index aca9cfd5..4fcf393d 100644
--- a/src/Merge.Client/Crm/Types/DirectionEnum.cs
+++ b/src/Merge.Client/Crm/Types/DirectionEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/EmailAddress.cs b/src/Merge.Client/Crm/Types/EmailAddress.cs
index c4ace241..0f2b5208 100644
--- a/src/Merge.Client/Crm/Types/EmailAddress.cs
+++ b/src/Merge.Client/Crm/Types/EmailAddress.cs
@@ -4,29 +4,29 @@
 
 namespace Merge.Client.Crm;
 
-public class EmailAddress
+public record EmailAddress
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The email address.
     /// </summary>
     [JsonPropertyName("email_address")]
-    public string? EmailAddress_ { get; init; }
+    public string? EmailAddress_ { get; set; }
 
     /// <summary>
     /// The email address's type.
     /// </summary>
     [JsonPropertyName("email_address_type")]
-    public string? EmailAddressType { get; init; }
+    public string? EmailAddressType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/EmailAddressRequest.cs b/src/Merge.Client/Crm/Types/EmailAddressRequest.cs
index c240823c..ee690f6b 100644
--- a/src/Merge.Client/Crm/Types/EmailAddressRequest.cs
+++ b/src/Merge.Client/Crm/Types/EmailAddressRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Crm;
 
-public class EmailAddressRequest
+public record EmailAddressRequest
 {
     /// <summary>
     /// The email address.
     /// </summary>
     [JsonPropertyName("email_address")]
-    public string? EmailAddress { get; init; }
+    public string? EmailAddress { get; set; }
 
     /// <summary>
     /// The email address's type.
     /// </summary>
     [JsonPropertyName("email_address_type")]
-    public string? EmailAddressType { get; init; }
+    public string? EmailAddressType { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/EnabledActionsEnum.cs b/src/Merge.Client/Crm/Types/EnabledActionsEnum.cs
index 0ee49464..d0d32a98 100644
--- a/src/Merge.Client/Crm/Types/EnabledActionsEnum.cs
+++ b/src/Merge.Client/Crm/Types/EnabledActionsEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/EncodingEnum.cs b/src/Merge.Client/Crm/Types/EncodingEnum.cs
index a8aed312..9b1922fa 100644
--- a/src/Merge.Client/Crm/Types/EncodingEnum.cs
+++ b/src/Merge.Client/Crm/Types/EncodingEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/Engagement.cs b/src/Merge.Client/Crm/Types/Engagement.cs
index e409ece0..1917144b 100644
--- a/src/Merge.Client/Crm/Types/Engagement.cs
+++ b/src/Merge.Client/Crm/Types/Engagement.cs
@@ -1,53 +1,52 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Engagement
+public record Engagement
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The engagement's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The engagement's content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// The engagement's subject.
     /// </summary>
     [JsonPropertyName("subject")]
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
 
     /// <summary>
     /// The engagement's direction.
@@ -56,33 +55,33 @@ public class Engagement
     /// - `OUTBOUND` - OUTBOUND
     /// </summary>
     [JsonPropertyName("direction")]
-    public DirectionEnum? Direction { get; init; }
+    public DirectionEnum? Direction { get; set; }
 
     /// <summary>
     /// The engagement type of the engagement.
     /// </summary>
     [JsonPropertyName("engagement_type")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, EngagementType>>))]
-    public OneOf<string, EngagementType>? EngagementType { get; init; }
+    public OneOf<string, EngagementType>? EngagementType { get; set; }
 
     /// <summary>
     /// The time at which the engagement started.
     /// </summary>
     [JsonPropertyName("start_time")]
-    public DateTime? StartTime { get; init; }
+    public DateTime? StartTime { get; set; }
 
     /// <summary>
     /// The time at which the engagement ended.
     /// </summary>
     [JsonPropertyName("end_time")]
-    public DateTime? EndTime { get; init; }
+    public DateTime? EndTime { get; set; }
 
     /// <summary>
     /// The account of the engagement.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     [JsonPropertyName("contacts")]
     [JsonConverter(
@@ -91,20 +90,20 @@ public class Engagement
             OneOfSerializer<OneOf<string, Contact>>
         >)
     )]
-    public IEnumerable<OneOf<string, Contact>>? Contacts { get; init; }
+    public IEnumerable<OneOf<string, Contact>>? Contacts { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/EngagementRequest.cs b/src/Merge.Client/Crm/Types/EngagementRequest.cs
index ad075b0d..cb0e62b8 100644
--- a/src/Merge.Client/Crm/Types/EngagementRequest.cs
+++ b/src/Merge.Client/Crm/Types/EngagementRequest.cs
@@ -1,32 +1,31 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class EngagementRequest
+public record EngagementRequest
 {
     /// <summary>
     /// The engagement's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The engagement's content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// The engagement's subject.
     /// </summary>
     [JsonPropertyName("subject")]
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
 
     /// <summary>
     /// The engagement's direction.
@@ -35,33 +34,33 @@ public class EngagementRequest
     /// - `OUTBOUND` - OUTBOUND
     /// </summary>
     [JsonPropertyName("direction")]
-    public DirectionEnum? Direction { get; init; }
+    public DirectionEnum? Direction { get; set; }
 
     /// <summary>
     /// The engagement type of the engagement.
     /// </summary>
     [JsonPropertyName("engagement_type")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, EngagementType>>))]
-    public OneOf<string, EngagementType>? EngagementType { get; init; }
+    public OneOf<string, EngagementType>? EngagementType { get; set; }
 
     /// <summary>
     /// The time at which the engagement started.
     /// </summary>
     [JsonPropertyName("start_time")]
-    public DateTime? StartTime { get; init; }
+    public DateTime? StartTime { get; set; }
 
     /// <summary>
     /// The time at which the engagement ended.
     /// </summary>
     [JsonPropertyName("end_time")]
-    public DateTime? EndTime { get; init; }
+    public DateTime? EndTime { get; set; }
 
     /// <summary>
     /// The account of the engagement.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     [JsonPropertyName("contacts")]
     [JsonConverter(
@@ -70,14 +69,14 @@ public class EngagementRequest
             OneOfSerializer<OneOf<string, Contact>>
         >)
     )]
-    public IEnumerable<OneOf<string, Contact>>? Contacts { get; init; }
+    public IEnumerable<OneOf<string, Contact>>? Contacts { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/EngagementResponse.cs b/src/Merge.Client/Crm/Types/EngagementResponse.cs
index 76c2fa47..682d03f3 100644
--- a/src/Merge.Client/Crm/Types/EngagementResponse.cs
+++ b/src/Merge.Client/Crm/Types/EngagementResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class EngagementResponse
+public record EngagementResponse
 {
     [JsonPropertyName("model")]
-    public Engagement Model { get; init; }
+    public required Engagement Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/EngagementType.cs b/src/Merge.Client/Crm/Types/EngagementType.cs
index 436f83c1..6b8b5bee 100644
--- a/src/Merge.Client/Crm/Types/EngagementType.cs
+++ b/src/Merge.Client/Crm/Types/EngagementType.cs
@@ -1,32 +1,31 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class EngagementType
+public record EngagementType
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The engagement type's activity type.
@@ -36,14 +35,14 @@ public class EngagementType
     /// - `EMAIL` - EMAIL
     /// </summary>
     [JsonPropertyName("activity_type")]
-    public ActivityTypeEnum? ActivityType { get; init; }
+    public ActivityTypeEnum? ActivityType { get; set; }
 
     /// <summary>
     /// The engagement type's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ErrorValidationProblem.cs b/src/Merge.Client/Crm/Types/ErrorValidationProblem.cs
index 30dd0766..a4d42d5e 100644
--- a/src/Merge.Client/Crm/Types/ErrorValidationProblem.cs
+++ b/src/Merge.Client/Crm/Types/ErrorValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class ErrorValidationProblem
+public record ErrorValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/EventTypeEnum.cs b/src/Merge.Client/Crm/Types/EventTypeEnum.cs
index 3ea2cc56..26085a7f 100644
--- a/src/Merge.Client/Crm/Types/EventTypeEnum.cs
+++ b/src/Merge.Client/Crm/Types/EventTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/ExternalTargetFieldApi.cs b/src/Merge.Client/Crm/Types/ExternalTargetFieldApi.cs
index 695774bc..3375665d 100644
--- a/src/Merge.Client/Crm/Types/ExternalTargetFieldApi.cs
+++ b/src/Merge.Client/Crm/Types/ExternalTargetFieldApi.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class ExternalTargetFieldApi
+public record ExternalTargetFieldApi
 {
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_mapped")]
-    public string? IsMapped { get; init; }
+    public string? IsMapped { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ExternalTargetFieldApiResponse.cs b/src/Merge.Client/Crm/Types/ExternalTargetFieldApiResponse.cs
index b8dcc69b..02bcb468 100644
--- a/src/Merge.Client/Crm/Types/ExternalTargetFieldApiResponse.cs
+++ b/src/Merge.Client/Crm/Types/ExternalTargetFieldApiResponse.cs
@@ -1,36 +1,35 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class ExternalTargetFieldApiResponse
+public record ExternalTargetFieldApiResponse
 {
     [JsonPropertyName("Account")]
-    public IEnumerable<ExternalTargetFieldApi>? Account { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Account { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<ExternalTargetFieldApi>? Contact { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Contact { get; set; }
 
     [JsonPropertyName("Lead")]
-    public IEnumerable<ExternalTargetFieldApi>? Lead { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Lead { get; set; }
 
     [JsonPropertyName("Note")]
-    public IEnumerable<ExternalTargetFieldApi>? Note { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Note { get; set; }
 
     [JsonPropertyName("Opportunity")]
-    public IEnumerable<ExternalTargetFieldApi>? Opportunity { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Opportunity { get; set; }
 
     [JsonPropertyName("Stage")]
-    public IEnumerable<ExternalTargetFieldApi>? Stage { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Stage { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<ExternalTargetFieldApi>? User { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? User { get; set; }
 
     [JsonPropertyName("Task")]
-    public IEnumerable<ExternalTargetFieldApi>? Task { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Task { get; set; }
 
     [JsonPropertyName("Engagement")]
-    public IEnumerable<ExternalTargetFieldApi>? Engagement { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Engagement { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldFormatEnum.cs b/src/Merge.Client/Crm/Types/FieldFormatEnum.cs
index 33f1cfa8..def27214 100644
--- a/src/Merge.Client/Crm/Types/FieldFormatEnum.cs
+++ b/src/Merge.Client/Crm/Types/FieldFormatEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/FieldMappingApiInstance.cs b/src/Merge.Client/Crm/Types/FieldMappingApiInstance.cs
index ce1ea41b..29f15409 100644
--- a/src/Merge.Client/Crm/Types/FieldMappingApiInstance.cs
+++ b/src/Merge.Client/Crm/Types/FieldMappingApiInstance.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class FieldMappingApiInstance
+public record FieldMappingApiInstance
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("is_integration_wide")]
-    public bool? IsIntegrationWide { get; init; }
+    public bool? IsIntegrationWide { get; set; }
 
     [JsonPropertyName("target_field")]
-    public FieldMappingApiInstanceTargetField? TargetField { get; init; }
+    public FieldMappingApiInstanceTargetField? TargetField { get; set; }
 
     [JsonPropertyName("remote_field")]
-    public FieldMappingApiInstanceRemoteField? RemoteField { get; init; }
+    public FieldMappingApiInstanceRemoteField? RemoteField { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldMappingApiInstanceRemoteField.cs b/src/Merge.Client/Crm/Types/FieldMappingApiInstanceRemoteField.cs
index 6c893605..3c410484 100644
--- a/src/Merge.Client/Crm/Types/FieldMappingApiInstanceRemoteField.cs
+++ b/src/Merge.Client/Crm/Types/FieldMappingApiInstanceRemoteField.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class FieldMappingApiInstanceRemoteField
+public record FieldMappingApiInstanceRemoteField
 {
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_endpoint_info")]
-    public FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs b/src/Merge.Client/Crm/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
index 77c75b35..2162877b 100644
--- a/src/Merge.Client/Crm/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
+++ b/src/Merge.Client/Crm/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
+public record FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string? Method { get; init; }
+    public string? Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string? UrlPath { get; init; }
+    public string? UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<string>? FieldTraversalPath { get; init; }
+    public IEnumerable<string>? FieldTraversalPath { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldMappingApiInstanceResponse.cs b/src/Merge.Client/Crm/Types/FieldMappingApiInstanceResponse.cs
index e580002b..775dd703 100644
--- a/src/Merge.Client/Crm/Types/FieldMappingApiInstanceResponse.cs
+++ b/src/Merge.Client/Crm/Types/FieldMappingApiInstanceResponse.cs
@@ -1,36 +1,35 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class FieldMappingApiInstanceResponse
+public record FieldMappingApiInstanceResponse
 {
     [JsonPropertyName("Account")]
-    public IEnumerable<FieldMappingApiInstance>? Account { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Account { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<FieldMappingApiInstance>? Contact { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Contact { get; set; }
 
     [JsonPropertyName("Lead")]
-    public IEnumerable<FieldMappingApiInstance>? Lead { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Lead { get; set; }
 
     [JsonPropertyName("Note")]
-    public IEnumerable<FieldMappingApiInstance>? Note { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Note { get; set; }
 
     [JsonPropertyName("Opportunity")]
-    public IEnumerable<FieldMappingApiInstance>? Opportunity { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Opportunity { get; set; }
 
     [JsonPropertyName("Stage")]
-    public IEnumerable<FieldMappingApiInstance>? Stage { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Stage { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<FieldMappingApiInstance>? User { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? User { get; set; }
 
     [JsonPropertyName("Task")]
-    public IEnumerable<FieldMappingApiInstance>? Task { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Task { get; set; }
 
     [JsonPropertyName("Engagement")]
-    public IEnumerable<FieldMappingApiInstance>? Engagement { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Engagement { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldMappingApiInstanceTargetField.cs b/src/Merge.Client/Crm/Types/FieldMappingApiInstanceTargetField.cs
index 9bc00ff9..36d9f4e6 100644
--- a/src/Merge.Client/Crm/Types/FieldMappingApiInstanceTargetField.cs
+++ b/src/Merge.Client/Crm/Types/FieldMappingApiInstanceTargetField.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class FieldMappingApiInstanceTargetField
+public record FieldMappingApiInstanceTargetField
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string Description { get; init; }
+    public required string Description { get; set; }
 
     [JsonPropertyName("is_organization_wide")]
-    public bool IsOrganizationWide { get; init; }
+    public required bool IsOrganizationWide { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldMappingInstanceResponse.cs b/src/Merge.Client/Crm/Types/FieldMappingInstanceResponse.cs
index 5c218229..7c44bc2e 100644
--- a/src/Merge.Client/Crm/Types/FieldMappingInstanceResponse.cs
+++ b/src/Merge.Client/Crm/Types/FieldMappingInstanceResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class FieldMappingInstanceResponse
+public record FieldMappingInstanceResponse
 {
     [JsonPropertyName("model")]
-    public FieldMappingApiInstance Model { get; init; }
+    public required FieldMappingApiInstance Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldPermissionDeserializer.cs b/src/Merge.Client/Crm/Types/FieldPermissionDeserializer.cs
index f404864a..7179d7f0 100644
--- a/src/Merge.Client/Crm/Types/FieldPermissionDeserializer.cs
+++ b/src/Merge.Client/Crm/Types/FieldPermissionDeserializer.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class FieldPermissionDeserializer
+public record FieldPermissionDeserializer
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldPermissionDeserializerRequest.cs b/src/Merge.Client/Crm/Types/FieldPermissionDeserializerRequest.cs
index 97eab2b6..d604903b 100644
--- a/src/Merge.Client/Crm/Types/FieldPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Crm/Types/FieldPermissionDeserializerRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class FieldPermissionDeserializerRequest
+public record FieldPermissionDeserializerRequest
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/FieldTypeEnum.cs b/src/Merge.Client/Crm/Types/FieldTypeEnum.cs
index 3be90a7b..f5f3e7d1 100644
--- a/src/Merge.Client/Crm/Types/FieldTypeEnum.cs
+++ b/src/Merge.Client/Crm/Types/FieldTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/IgnoreCommonModelRequest.cs b/src/Merge.Client/Crm/Types/IgnoreCommonModelRequest.cs
index 4d982b08..e221f9f3 100644
--- a/src/Merge.Client/Crm/Types/IgnoreCommonModelRequest.cs
+++ b/src/Merge.Client/Crm/Types/IgnoreCommonModelRequest.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class IgnoreCommonModelRequest
+public record IgnoreCommonModelRequest
 {
     [JsonPropertyName("reason")]
-    public ReasonEnum Reason { get; init; }
+    public required ReasonEnum Reason { get; set; }
 
     [JsonPropertyName("message")]
-    public string? Message { get; init; }
+    public string? Message { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/IndividualCommonModelScopeDeserializer.cs b/src/Merge.Client/Crm/Types/IndividualCommonModelScopeDeserializer.cs
index 7afc38fc..353a908d 100644
--- a/src/Merge.Client/Crm/Types/IndividualCommonModelScopeDeserializer.cs
+++ b/src/Merge.Client/Crm/Types/IndividualCommonModelScopeDeserializer.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class IndividualCommonModelScopeDeserializer
+public record IndividualCommonModelScopeDeserializer
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializer? FieldPermissions { get; init; }
+    public FieldPermissionDeserializer? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/IndividualCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Crm/Types/IndividualCommonModelScopeDeserializerRequest.cs
index 539ae559..9ec81b58 100644
--- a/src/Merge.Client/Crm/Types/IndividualCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Crm/Types/IndividualCommonModelScopeDeserializerRequest.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class IndividualCommonModelScopeDeserializerRequest
+public record IndividualCommonModelScopeDeserializerRequest
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializerRequest? FieldPermissions { get; init; }
+    public FieldPermissionDeserializerRequest? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/Issue.cs b/src/Merge.Client/Crm/Types/Issue.cs
index 9f5b4ec8..95fc56fb 100644
--- a/src/Merge.Client/Crm/Types/Issue.cs
+++ b/src/Merge.Client/Crm/Types/Issue.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Issue
+public record Issue
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -17,23 +16,23 @@ public class Issue
     /// - `RESOLVED` - RESOLVED
     /// </summary>
     [JsonPropertyName("status")]
-    public IssueStatusEnum? Status { get; init; }
+    public IssueStatusEnum? Status { get; set; }
 
     [JsonPropertyName("error_description")]
-    public string ErrorDescription { get; init; }
+    public required string ErrorDescription { get; set; }
 
     [JsonPropertyName("end_user")]
-    public Dictionary<string, object>? EndUser { get; init; }
+    public Dictionary<string, object?>? EndUser { get; set; }
 
     [JsonPropertyName("first_incident_time")]
-    public DateTime? FirstIncidentTime { get; init; }
+    public DateTime? FirstIncidentTime { get; set; }
 
     [JsonPropertyName("last_incident_time")]
-    public DateTime? LastIncidentTime { get; init; }
+    public DateTime? LastIncidentTime { get; set; }
 
     [JsonPropertyName("is_muted")]
-    public bool? IsMuted { get; init; }
+    public bool? IsMuted { get; set; }
 
     [JsonPropertyName("error_details")]
-    public IEnumerable<string>? ErrorDetails { get; init; }
+    public IEnumerable<string>? ErrorDetails { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/IssueStatusEnum.cs b/src/Merge.Client/Crm/Types/IssueStatusEnum.cs
index a089c98c..db32dd27 100644
--- a/src/Merge.Client/Crm/Types/IssueStatusEnum.cs
+++ b/src/Merge.Client/Crm/Types/IssueStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/ItemFormatEnum.cs b/src/Merge.Client/Crm/Types/ItemFormatEnum.cs
index 12120a5d..749970ae 100644
--- a/src/Merge.Client/Crm/Types/ItemFormatEnum.cs
+++ b/src/Merge.Client/Crm/Types/ItemFormatEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/ItemSchema.cs b/src/Merge.Client/Crm/Types/ItemSchema.cs
index c34b07af..9882fed5 100644
--- a/src/Merge.Client/Crm/Types/ItemSchema.cs
+++ b/src/Merge.Client/Crm/Types/ItemSchema.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class ItemSchema
+public record ItemSchema
 {
     [JsonPropertyName("item_type")]
-    public ItemTypeEnum? ItemType { get; init; }
+    public ItemTypeEnum? ItemType { get; set; }
 
     [JsonPropertyName("item_format")]
-    public ItemFormatEnum? ItemFormat { get; init; }
+    public ItemFormatEnum? ItemFormat { get; set; }
 
     [JsonPropertyName("item_choices")]
-    public IEnumerable<string>? ItemChoices { get; init; }
+    public IEnumerable<string>? ItemChoices { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ItemTypeEnum.cs b/src/Merge.Client/Crm/Types/ItemTypeEnum.cs
index 3f3fd31d..1627a949 100644
--- a/src/Merge.Client/Crm/Types/ItemTypeEnum.cs
+++ b/src/Merge.Client/Crm/Types/ItemTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/Lead.cs b/src/Merge.Client/Crm/Types/Lead.cs
index 73cfbeab..1e4a5f03 100644
--- a/src/Merge.Client/Crm/Types/Lead.cs
+++ b/src/Merge.Client/Crm/Types/Lead.cs
@@ -1,122 +1,121 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Lead
+public record Lead
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The lead's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The lead's source.
     /// </summary>
     [JsonPropertyName("lead_source")]
-    public string? LeadSource { get; init; }
+    public string? LeadSource { get; set; }
 
     /// <summary>
     /// The lead's title.
     /// </summary>
     [JsonPropertyName("title")]
-    public string? Title { get; init; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// The lead's company.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// The lead's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The lead's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<Address>? Addresses { get; init; }
+    public IEnumerable<Address>? Addresses { get; set; }
 
     [JsonPropertyName("email_addresses")]
-    public IEnumerable<EmailAddress>? EmailAddresses { get; init; }
+    public IEnumerable<EmailAddress>? EmailAddresses { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumber>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumber>? PhoneNumbers { get; set; }
 
     /// <summary>
     /// When the third party's lead was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// When the third party's lead was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the lead was converted.
     /// </summary>
     [JsonPropertyName("converted_date")]
-    public DateTime? ConvertedDate { get; init; }
+    public DateTime? ConvertedDate { get; set; }
 
     /// <summary>
     /// The contact of the converted lead.
     /// </summary>
     [JsonPropertyName("converted_contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? ConvertedContact { get; init; }
+    public OneOf<string, Contact>? ConvertedContact { get; set; }
 
     /// <summary>
     /// The account of the converted lead.
     /// </summary>
     [JsonPropertyName("converted_account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? ConvertedAccount { get; init; }
+    public OneOf<string, Account>? ConvertedAccount { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/LeadRequest.cs b/src/Merge.Client/Crm/Types/LeadRequest.cs
index 5ef8d173..aa00f07f 100644
--- a/src/Merge.Client/Crm/Types/LeadRequest.cs
+++ b/src/Merge.Client/Crm/Types/LeadRequest.cs
@@ -1,86 +1,85 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class LeadRequest
+public record LeadRequest
 {
     /// <summary>
     /// The lead's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The lead's source.
     /// </summary>
     [JsonPropertyName("lead_source")]
-    public string? LeadSource { get; init; }
+    public string? LeadSource { get; set; }
 
     /// <summary>
     /// The lead's title.
     /// </summary>
     [JsonPropertyName("title")]
-    public string? Title { get; init; }
+    public string? Title { get; set; }
 
     /// <summary>
     /// The lead's company.
     /// </summary>
     [JsonPropertyName("company")]
-    public string? Company { get; init; }
+    public string? Company { get; set; }
 
     /// <summary>
     /// The lead's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The lead's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<AddressRequest>? Addresses { get; init; }
+    public IEnumerable<AddressRequest>? Addresses { get; set; }
 
     [JsonPropertyName("email_addresses")]
-    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; init; }
+    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; set; }
 
     /// <summary>
     /// When the lead was converted.
     /// </summary>
     [JsonPropertyName("converted_date")]
-    public DateTime? ConvertedDate { get; init; }
+    public DateTime? ConvertedDate { get; set; }
 
     /// <summary>
     /// The contact of the converted lead.
     /// </summary>
     [JsonPropertyName("converted_contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? ConvertedContact { get; init; }
+    public OneOf<string, Contact>? ConvertedContact { get; set; }
 
     /// <summary>
     /// The account of the converted lead.
     /// </summary>
     [JsonPropertyName("converted_account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? ConvertedAccount { get; init; }
+    public OneOf<string, Account>? ConvertedAccount { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/LeadResponse.cs b/src/Merge.Client/Crm/Types/LeadResponse.cs
index 8f5d7f51..cd8c55de 100644
--- a/src/Merge.Client/Crm/Types/LeadResponse.cs
+++ b/src/Merge.Client/Crm/Types/LeadResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class LeadResponse
+public record LeadResponse
 {
     [JsonPropertyName("model")]
-    public Lead Model { get; init; }
+    public required Lead Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/LinkToken.cs b/src/Merge.Client/Crm/Types/LinkToken.cs
index c743af97..aedc6865 100644
--- a/src/Merge.Client/Crm/Types/LinkToken.cs
+++ b/src/Merge.Client/Crm/Types/LinkToken.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class LinkToken
+public record LinkToken
 {
     [JsonPropertyName("link_token")]
-    public string LinkToken_ { get; init; }
+    public required string LinkToken_ { get; set; }
 
     [JsonPropertyName("integration_name")]
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     [JsonPropertyName("magic_link_url")]
-    public string? MagicLinkUrl { get; init; }
+    public string? MagicLinkUrl { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/LinkedAccountStatus.cs b/src/Merge.Client/Crm/Types/LinkedAccountStatus.cs
index decff321..11d1a264 100644
--- a/src/Merge.Client/Crm/Types/LinkedAccountStatus.cs
+++ b/src/Merge.Client/Crm/Types/LinkedAccountStatus.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class LinkedAccountStatus
+public record LinkedAccountStatus
 {
     [JsonPropertyName("linked_account_status")]
-    public string LinkedAccountStatus_ { get; init; }
+    public required string LinkedAccountStatus_ { get; set; }
 
     [JsonPropertyName("can_make_request")]
-    public bool CanMakeRequest { get; init; }
+    public required bool CanMakeRequest { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/MetaResponse.cs b/src/Merge.Client/Crm/Types/MetaResponse.cs
index f505e8f7..79028a4c 100644
--- a/src/Merge.Client/Crm/Types/MetaResponse.cs
+++ b/src/Merge.Client/Crm/Types/MetaResponse.cs
@@ -1,24 +1,24 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class MetaResponse
+public record MetaResponse
 {
     [JsonPropertyName("request_schema")]
-    public Dictionary<string, object> RequestSchema { get; init; }
+    public Dictionary<string, object?> RequestSchema { get; set; } =
+        new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_field_classes")]
-    public Dictionary<string, object>? RemoteFieldClasses { get; init; }
+    public Dictionary<string, object?>? RemoteFieldClasses { get; set; }
 
     [JsonPropertyName("status")]
-    public LinkedAccountStatus? Status { get; init; }
+    public LinkedAccountStatus? Status { get; set; }
 
     [JsonPropertyName("has_conditional_params")]
-    public bool HasConditionalParams { get; init; }
+    public required bool HasConditionalParams { get; set; }
 
     [JsonPropertyName("has_required_linked_account_params")]
-    public bool HasRequiredLinkedAccountParams { get; init; }
+    public required bool HasRequiredLinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/MethodEnum.cs b/src/Merge.Client/Crm/Types/MethodEnum.cs
index 23503bca..69959a56 100644
--- a/src/Merge.Client/Crm/Types/MethodEnum.cs
+++ b/src/Merge.Client/Crm/Types/MethodEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/ModelOperation.cs b/src/Merge.Client/Crm/Types/ModelOperation.cs
index 07047afd..de633d95 100644
--- a/src/Merge.Client/Crm/Types/ModelOperation.cs
+++ b/src/Merge.Client/Crm/Types/ModelOperation.cs
@@ -4,17 +4,17 @@
 
 namespace Merge.Client.Crm;
 
-public class ModelOperation
+public record ModelOperation
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("available_operations")]
-    public IEnumerable<string> AvailableOperations { get; init; }
+    public IEnumerable<string> AvailableOperations { get; set; } = new List<string>();
 
     [JsonPropertyName("required_post_parameters")]
-    public IEnumerable<string> RequiredPostParameters { get; init; }
+    public IEnumerable<string> RequiredPostParameters { get; set; } = new List<string>();
 
     [JsonPropertyName("supported_fields")]
-    public IEnumerable<string> SupportedFields { get; init; }
+    public IEnumerable<string> SupportedFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Crm/Types/ModelPermissionDeserializer.cs b/src/Merge.Client/Crm/Types/ModelPermissionDeserializer.cs
index 943d7768..12225328 100644
--- a/src/Merge.Client/Crm/Types/ModelPermissionDeserializer.cs
+++ b/src/Merge.Client/Crm/Types/ModelPermissionDeserializer.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Crm;
 
-public class ModelPermissionDeserializer
+public record ModelPermissionDeserializer
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ModelPermissionDeserializerRequest.cs b/src/Merge.Client/Crm/Types/ModelPermissionDeserializerRequest.cs
index 954e45c1..5daec1a1 100644
--- a/src/Merge.Client/Crm/Types/ModelPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Crm/Types/ModelPermissionDeserializerRequest.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Crm;
 
-public class ModelPermissionDeserializerRequest
+public record ModelPermissionDeserializerRequest
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/MultipartFormFieldRequest.cs b/src/Merge.Client/Crm/Types/MultipartFormFieldRequest.cs
index 54e56b85..8b7484f8 100644
--- a/src/Merge.Client/Crm/Types/MultipartFormFieldRequest.cs
+++ b/src/Merge.Client/Crm/Types/MultipartFormFieldRequest.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class MultipartFormFieldRequest
+public record MultipartFormFieldRequest
 {
     /// <summary>
     /// The name of the form field
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// The data for the form field.
     /// </summary>
     [JsonPropertyName("data")]
-    public string Data { get; init; }
+    public required string Data { get; set; }
 
     /// <summary>
     /// The encoding of the value of `data`. Defaults to `RAW` if not defined.
@@ -27,17 +26,17 @@ public class MultipartFormFieldRequest
     /// - `GZIP_BASE64` - GZIP_BASE64
     /// </summary>
     [JsonPropertyName("encoding")]
-    public EncodingEnum? Encoding { get; init; }
+    public EncodingEnum? Encoding { get; set; }
 
     /// <summary>
     /// The file name of the form field, if the field is for a file.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The MIME type of the file, if the field is for a file.
     /// </summary>
     [JsonPropertyName("content_type")]
-    public string? ContentType { get; init; }
+    public string? ContentType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/Note.cs b/src/Merge.Client/Crm/Types/Note.cs
index 25fbf199..e0a1e2f0 100644
--- a/src/Merge.Client/Crm/Types/Note.cs
+++ b/src/Merge.Client/Crm/Types/Note.cs
@@ -1,90 +1,89 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Note
+public record Note
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The note's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The note's content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// The note's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The note's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The note's opportunity.
     /// </summary>
     [JsonPropertyName("opportunity")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Opportunity>>))]
-    public OneOf<string, Opportunity>? Opportunity { get; init; }
+    public OneOf<string, Opportunity>? Opportunity { get; set; }
 
     /// <summary>
     /// When the third party's lead was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// When the third party's lead was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/NoteRequest.cs b/src/Merge.Client/Crm/Types/NoteRequest.cs
index d4729eba..d81df04c 100644
--- a/src/Merge.Client/Crm/Types/NoteRequest.cs
+++ b/src/Merge.Client/Crm/Types/NoteRequest.cs
@@ -1,54 +1,53 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class NoteRequest
+public record NoteRequest
 {
     /// <summary>
     /// The note's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The note's content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// The note's contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The note's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The note's opportunity.
     /// </summary>
     [JsonPropertyName("opportunity")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Opportunity>>))]
-    public OneOf<string, Opportunity>? Opportunity { get; init; }
+    public OneOf<string, Opportunity>? Opportunity { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/NoteResponse.cs b/src/Merge.Client/Crm/Types/NoteResponse.cs
index 30e928a3..fcc5ce7d 100644
--- a/src/Merge.Client/Crm/Types/NoteResponse.cs
+++ b/src/Merge.Client/Crm/Types/NoteResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class NoteResponse
+public record NoteResponse
 {
     [JsonPropertyName("model")]
-    public Note Model { get; init; }
+    public required Note Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ObjectClassDescriptionRequest.cs b/src/Merge.Client/Crm/Types/ObjectClassDescriptionRequest.cs
index fd1004ad..710de42b 100644
--- a/src/Merge.Client/Crm/Types/ObjectClassDescriptionRequest.cs
+++ b/src/Merge.Client/Crm/Types/ObjectClassDescriptionRequest.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class ObjectClassDescriptionRequest
+public record ObjectClassDescriptionRequest
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("origin_type")]
-    public OriginTypeEnum OriginType { get; init; }
+    public required OriginTypeEnum OriginType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/Opportunity.cs b/src/Merge.Client/Crm/Types/Opportunity.cs
index 4766fb8e..b56f2a6c 100644
--- a/src/Merge.Client/Crm/Types/Opportunity.cs
+++ b/src/Merge.Client/Crm/Types/Opportunity.cs
@@ -1,73 +1,72 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Opportunity
+public record Opportunity
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The opportunity's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The opportunity's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The opportunity's amount.
     /// </summary>
     [JsonPropertyName("amount")]
-    public int? Amount { get; init; }
+    public int? Amount { get; set; }
 
     /// <summary>
     /// The opportunity's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The account of the opportunity.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The stage of the opportunity.
     /// </summary>
     [JsonPropertyName("stage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Stage>>))]
-    public OneOf<string, Stage>? Stage { get; init; }
+    public OneOf<string, Stage>? Stage { get; set; }
 
     /// <summary>
     /// The opportunity's status.
@@ -77,35 +76,35 @@ public class Opportunity
     /// - `LOST` - LOST
     /// </summary>
     [JsonPropertyName("status")]
-    public OpportunityStatusEnum? Status { get; init; }
+    public OpportunityStatusEnum? Status { get; set; }
 
     /// <summary>
     /// When the opportunity's last activity occurred.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     /// <summary>
     /// When the opportunity was closed.
     /// </summary>
     [JsonPropertyName("close_date")]
-    public DateTime? CloseDate { get; init; }
+    public DateTime? CloseDate { get; set; }
 
     /// <summary>
     /// When the third party's opportunity was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/OpportunityRequest.cs b/src/Merge.Client/Crm/Types/OpportunityRequest.cs
index b2e6c504..f8fc2c9d 100644
--- a/src/Merge.Client/Crm/Types/OpportunityRequest.cs
+++ b/src/Merge.Client/Crm/Types/OpportunityRequest.cs
@@ -1,52 +1,51 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class OpportunityRequest
+public record OpportunityRequest
 {
     /// <summary>
     /// The opportunity's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The opportunity's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The opportunity's amount.
     /// </summary>
     [JsonPropertyName("amount")]
-    public int? Amount { get; init; }
+    public int? Amount { get; set; }
 
     /// <summary>
     /// The opportunity's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The account of the opportunity.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The stage of the opportunity.
     /// </summary>
     [JsonPropertyName("stage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Stage>>))]
-    public OneOf<string, Stage>? Stage { get; init; }
+    public OneOf<string, Stage>? Stage { get; set; }
 
     /// <summary>
     /// The opportunity's status.
@@ -56,26 +55,26 @@ public class OpportunityRequest
     /// - `LOST` - LOST
     /// </summary>
     [JsonPropertyName("status")]
-    public OpportunityStatusEnum? Status { get; init; }
+    public OpportunityStatusEnum? Status { get; set; }
 
     /// <summary>
     /// When the opportunity's last activity occurred.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     /// <summary>
     /// When the opportunity was closed.
     /// </summary>
     [JsonPropertyName("close_date")]
-    public DateTime? CloseDate { get; init; }
+    public DateTime? CloseDate { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/OpportunityResponse.cs b/src/Merge.Client/Crm/Types/OpportunityResponse.cs
index 45ba8818..d85b660a 100644
--- a/src/Merge.Client/Crm/Types/OpportunityResponse.cs
+++ b/src/Merge.Client/Crm/Types/OpportunityResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class OpportunityResponse
+public record OpportunityResponse
 {
     [JsonPropertyName("model")]
-    public Opportunity Model { get; init; }
+    public required Opportunity Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/OpportunityStatusEnum.cs b/src/Merge.Client/Crm/Types/OpportunityStatusEnum.cs
index 56d12d51..6d7b08eb 100644
--- a/src/Merge.Client/Crm/Types/OpportunityStatusEnum.cs
+++ b/src/Merge.Client/Crm/Types/OpportunityStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/OriginTypeEnum.cs b/src/Merge.Client/Crm/Types/OriginTypeEnum.cs
index a6a25389..57d5b1f2 100644
--- a/src/Merge.Client/Crm/Types/OriginTypeEnum.cs
+++ b/src/Merge.Client/Crm/Types/OriginTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/PaginatedAccountDetailsAndActionsList.cs b/src/Merge.Client/Crm/Types/PaginatedAccountDetailsAndActionsList.cs
index 9d935700..5429600a 100644
--- a/src/Merge.Client/Crm/Types/PaginatedAccountDetailsAndActionsList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedAccountDetailsAndActionsList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedAccountDetailsAndActionsList
+public record PaginatedAccountDetailsAndActionsList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AccountDetailsAndActions>? Results { get; init; }
+    public IEnumerable<AccountDetailsAndActions>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedAccountList.cs b/src/Merge.Client/Crm/Types/PaginatedAccountList.cs
index ff2dc551..7a29c442 100644
--- a/src/Merge.Client/Crm/Types/PaginatedAccountList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedAccountList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedAccountList
+public record PaginatedAccountList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Account>? Results { get; init; }
+    public IEnumerable<Account>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedAssociationList.cs b/src/Merge.Client/Crm/Types/PaginatedAssociationList.cs
index 9a486b36..eb0924f6 100644
--- a/src/Merge.Client/Crm/Types/PaginatedAssociationList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedAssociationList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedAssociationList
+public record PaginatedAssociationList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Association>? Results { get; init; }
+    public IEnumerable<Association>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedAssociationTypeList.cs b/src/Merge.Client/Crm/Types/PaginatedAssociationTypeList.cs
index 8d1c4e6f..9d769f19 100644
--- a/src/Merge.Client/Crm/Types/PaginatedAssociationTypeList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedAssociationTypeList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedAssociationTypeList
+public record PaginatedAssociationTypeList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AssociationType>? Results { get; init; }
+    public IEnumerable<AssociationType>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedAuditLogEventList.cs b/src/Merge.Client/Crm/Types/PaginatedAuditLogEventList.cs
index f1a3150e..762eca2d 100644
--- a/src/Merge.Client/Crm/Types/PaginatedAuditLogEventList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedAuditLogEventList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedAuditLogEventList
+public record PaginatedAuditLogEventList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AuditLogEvent>? Results { get; init; }
+    public IEnumerable<AuditLogEvent>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedContactList.cs b/src/Merge.Client/Crm/Types/PaginatedContactList.cs
index 348b2528..9e0f0dd3 100644
--- a/src/Merge.Client/Crm/Types/PaginatedContactList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedContactList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedContactList
+public record PaginatedContactList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Contact>? Results { get; init; }
+    public IEnumerable<Contact>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedCustomObjectClassList.cs b/src/Merge.Client/Crm/Types/PaginatedCustomObjectClassList.cs
index 65e96f9c..5e0d5dc1 100644
--- a/src/Merge.Client/Crm/Types/PaginatedCustomObjectClassList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedCustomObjectClassList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedCustomObjectClassList
+public record PaginatedCustomObjectClassList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<CustomObjectClass>? Results { get; init; }
+    public IEnumerable<CustomObjectClass>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedCustomObjectList.cs b/src/Merge.Client/Crm/Types/PaginatedCustomObjectList.cs
index 615cd7e9..5283acde 100644
--- a/src/Merge.Client/Crm/Types/PaginatedCustomObjectList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedCustomObjectList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedCustomObjectList
+public record PaginatedCustomObjectList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<CustomObject>? Results { get; init; }
+    public IEnumerable<CustomObject>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedEngagementList.cs b/src/Merge.Client/Crm/Types/PaginatedEngagementList.cs
index 894bded8..ed551589 100644
--- a/src/Merge.Client/Crm/Types/PaginatedEngagementList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedEngagementList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedEngagementList
+public record PaginatedEngagementList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Engagement>? Results { get; init; }
+    public IEnumerable<Engagement>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedEngagementTypeList.cs b/src/Merge.Client/Crm/Types/PaginatedEngagementTypeList.cs
index 8da04fd2..0ba66849 100644
--- a/src/Merge.Client/Crm/Types/PaginatedEngagementTypeList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedEngagementTypeList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedEngagementTypeList
+public record PaginatedEngagementTypeList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<EngagementType>? Results { get; init; }
+    public IEnumerable<EngagementType>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedIssueList.cs b/src/Merge.Client/Crm/Types/PaginatedIssueList.cs
index f4ea203b..1b9f3e14 100644
--- a/src/Merge.Client/Crm/Types/PaginatedIssueList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedIssueList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedIssueList
+public record PaginatedIssueList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Issue>? Results { get; init; }
+    public IEnumerable<Issue>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedLeadList.cs b/src/Merge.Client/Crm/Types/PaginatedLeadList.cs
index 7c9080c3..cdd3ec9b 100644
--- a/src/Merge.Client/Crm/Types/PaginatedLeadList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedLeadList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedLeadList
+public record PaginatedLeadList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Lead>? Results { get; init; }
+    public IEnumerable<Lead>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedNoteList.cs b/src/Merge.Client/Crm/Types/PaginatedNoteList.cs
index a4a1081d..5b017ad3 100644
--- a/src/Merge.Client/Crm/Types/PaginatedNoteList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedNoteList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedNoteList
+public record PaginatedNoteList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Note>? Results { get; init; }
+    public IEnumerable<Note>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedOpportunityList.cs b/src/Merge.Client/Crm/Types/PaginatedOpportunityList.cs
index 84c23c1a..0ad371f4 100644
--- a/src/Merge.Client/Crm/Types/PaginatedOpportunityList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedOpportunityList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedOpportunityList
+public record PaginatedOpportunityList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Opportunity>? Results { get; init; }
+    public IEnumerable<Opportunity>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedRemoteFieldClassList.cs b/src/Merge.Client/Crm/Types/PaginatedRemoteFieldClassList.cs
index 0ddb87a1..b0a56d13 100644
--- a/src/Merge.Client/Crm/Types/PaginatedRemoteFieldClassList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedRemoteFieldClassList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedRemoteFieldClassList
+public record PaginatedRemoteFieldClassList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<RemoteFieldClass>? Results { get; init; }
+    public IEnumerable<RemoteFieldClass>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedStageList.cs b/src/Merge.Client/Crm/Types/PaginatedStageList.cs
index f3674ac0..c99390a2 100644
--- a/src/Merge.Client/Crm/Types/PaginatedStageList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedStageList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedStageList
+public record PaginatedStageList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Stage>? Results { get; init; }
+    public IEnumerable<Stage>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedSyncStatusList.cs b/src/Merge.Client/Crm/Types/PaginatedSyncStatusList.cs
index 3c5d73c4..4832ecc0 100644
--- a/src/Merge.Client/Crm/Types/PaginatedSyncStatusList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedSyncStatusList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedSyncStatusList
+public record PaginatedSyncStatusList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<SyncStatus>? Results { get; init; }
+    public IEnumerable<SyncStatus>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedTaskList.cs b/src/Merge.Client/Crm/Types/PaginatedTaskList.cs
index f13e9b29..f295a5af 100644
--- a/src/Merge.Client/Crm/Types/PaginatedTaskList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedTaskList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedTaskList
+public record PaginatedTaskList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Task>? Results { get; init; }
+    public IEnumerable<Task>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PaginatedUserList.cs b/src/Merge.Client/Crm/Types/PaginatedUserList.cs
index afff304e..f408bde7 100644
--- a/src/Merge.Client/Crm/Types/PaginatedUserList.cs
+++ b/src/Merge.Client/Crm/Types/PaginatedUserList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PaginatedUserList
+public record PaginatedUserList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<User>? Results { get; init; }
+    public IEnumerable<User>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PatchedAccountRequest.cs b/src/Merge.Client/Crm/Types/PatchedAccountRequest.cs
index a3a382a2..dc67ed34 100644
--- a/src/Merge.Client/Crm/Types/PatchedAccountRequest.cs
+++ b/src/Merge.Client/Crm/Types/PatchedAccountRequest.cs
@@ -1,63 +1,62 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PatchedAccountRequest
+public record PatchedAccountRequest
 {
     /// <summary>
     /// The account's owner.
     /// </summary>
     [JsonPropertyName("owner")]
-    public string? Owner { get; init; }
+    public string? Owner { get; set; }
 
     /// <summary>
     /// The account's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The account's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The account's industry.
     /// </summary>
     [JsonPropertyName("industry")]
-    public string? Industry { get; init; }
+    public string? Industry { get; set; }
 
     /// <summary>
     /// The account's website.
     /// </summary>
     [JsonPropertyName("website")]
-    public string? Website { get; init; }
+    public string? Website { get; set; }
 
     /// <summary>
     /// The account's number of employees.
     /// </summary>
     [JsonPropertyName("number_of_employees")]
-    public int? NumberOfEmployees { get; init; }
+    public int? NumberOfEmployees { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<AddressRequest>? Addresses { get; init; }
+    public IEnumerable<AddressRequest>? Addresses { get; set; }
 
     /// <summary>
     /// The last date (either most recent or furthest in the future) of when an activity occurs in an account.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PatchedContactRequest.cs b/src/Merge.Client/Crm/Types/PatchedContactRequest.cs
index daac940c..21573011 100644
--- a/src/Merge.Client/Crm/Types/PatchedContactRequest.cs
+++ b/src/Merge.Client/Crm/Types/PatchedContactRequest.cs
@@ -1,60 +1,59 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PatchedContactRequest
+public record PatchedContactRequest
 {
     /// <summary>
     /// The contact's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The contact's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The contact's account.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// The contact's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     [JsonPropertyName("addresses")]
-    public IEnumerable<AddressRequest>? Addresses { get; init; }
+    public IEnumerable<AddressRequest>? Addresses { get; set; }
 
     [JsonPropertyName("email_addresses")]
-    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; init; }
+    public IEnumerable<EmailAddressRequest>? EmailAddresses { get; set; }
 
     [JsonPropertyName("phone_numbers")]
-    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; init; }
+    public IEnumerable<PhoneNumberRequest>? PhoneNumbers { get; set; }
 
     /// <summary>
     /// When the contact's last activity occurred.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PatchedEngagementRequest.cs b/src/Merge.Client/Crm/Types/PatchedEngagementRequest.cs
index 6033c796..81325df7 100644
--- a/src/Merge.Client/Crm/Types/PatchedEngagementRequest.cs
+++ b/src/Merge.Client/Crm/Types/PatchedEngagementRequest.cs
@@ -1,29 +1,28 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PatchedEngagementRequest
+public record PatchedEngagementRequest
 {
     /// <summary>
     /// The engagement's owner.
     /// </summary>
     [JsonPropertyName("owner")]
-    public string? Owner { get; init; }
+    public string? Owner { get; set; }
 
     /// <summary>
     /// The engagement's content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// The engagement's subject.
     /// </summary>
     [JsonPropertyName("subject")]
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
 
     /// <summary>
     /// The engagement's direction.
@@ -32,41 +31,41 @@ public class PatchedEngagementRequest
     /// - `OUTBOUND` - OUTBOUND
     /// </summary>
     [JsonPropertyName("direction")]
-    public DirectionEnum? Direction { get; init; }
+    public DirectionEnum? Direction { get; set; }
 
     /// <summary>
     /// The engagement type of the engagement.
     /// </summary>
     [JsonPropertyName("engagement_type")]
-    public string? EngagementType { get; init; }
+    public string? EngagementType { get; set; }
 
     /// <summary>
     /// The time at which the engagement started.
     /// </summary>
     [JsonPropertyName("start_time")]
-    public DateTime? StartTime { get; init; }
+    public DateTime? StartTime { get; set; }
 
     /// <summary>
     /// The time at which the engagement ended.
     /// </summary>
     [JsonPropertyName("end_time")]
-    public DateTime? EndTime { get; init; }
+    public DateTime? EndTime { get; set; }
 
     /// <summary>
     /// The account of the engagement.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     [JsonPropertyName("contacts")]
-    public IEnumerable<string>? Contacts { get; init; }
+    public IEnumerable<string>? Contacts { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PatchedOpportunityRequest.cs b/src/Merge.Client/Crm/Types/PatchedOpportunityRequest.cs
index 58b59ea4..349513eb 100644
--- a/src/Merge.Client/Crm/Types/PatchedOpportunityRequest.cs
+++ b/src/Merge.Client/Crm/Types/PatchedOpportunityRequest.cs
@@ -1,47 +1,46 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PatchedOpportunityRequest
+public record PatchedOpportunityRequest
 {
     /// <summary>
     /// The opportunity's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The opportunity's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The opportunity's amount.
     /// </summary>
     [JsonPropertyName("amount")]
-    public int? Amount { get; init; }
+    public int? Amount { get; set; }
 
     /// <summary>
     /// The opportunity's owner.
     /// </summary>
     [JsonPropertyName("owner")]
-    public string? Owner { get; init; }
+    public string? Owner { get; set; }
 
     /// <summary>
     /// The account of the opportunity.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// The stage of the opportunity.
     /// </summary>
     [JsonPropertyName("stage")]
-    public string? Stage { get; init; }
+    public string? Stage { get; set; }
 
     /// <summary>
     /// The opportunity's status.
@@ -51,26 +50,26 @@ public class PatchedOpportunityRequest
     /// - `LOST` - LOST
     /// </summary>
     [JsonPropertyName("status")]
-    public OpportunityStatusEnum? Status { get; init; }
+    public OpportunityStatusEnum? Status { get; set; }
 
     /// <summary>
     /// When the opportunity's last activity occurred.
     /// </summary>
     [JsonPropertyName("last_activity_at")]
-    public DateTime? LastActivityAt { get; init; }
+    public DateTime? LastActivityAt { get; set; }
 
     /// <summary>
     /// When the opportunity was closed.
     /// </summary>
     [JsonPropertyName("close_date")]
-    public DateTime? CloseDate { get; init; }
+    public DateTime? CloseDate { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PatchedTaskRequest.cs b/src/Merge.Client/Crm/Types/PatchedTaskRequest.cs
index 7adfdd9d..c8811475 100644
--- a/src/Merge.Client/Crm/Types/PatchedTaskRequest.cs
+++ b/src/Merge.Client/Crm/Types/PatchedTaskRequest.cs
@@ -1,53 +1,52 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class PatchedTaskRequest
+public record PatchedTaskRequest
 {
     /// <summary>
     /// The task's subject.
     /// </summary>
     [JsonPropertyName("subject")]
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
 
     /// <summary>
     /// The task's content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// The task's owner.
     /// </summary>
     [JsonPropertyName("owner")]
-    public string? Owner { get; init; }
+    public string? Owner { get; set; }
 
     /// <summary>
     /// The task's account.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// The task's opportunity.
     /// </summary>
     [JsonPropertyName("opportunity")]
-    public string? Opportunity { get; init; }
+    public string? Opportunity { get; set; }
 
     /// <summary>
     /// When the task is completed.
     /// </summary>
     [JsonPropertyName("completed_date")]
-    public DateTime? CompletedDate { get; init; }
+    public DateTime? CompletedDate { get; set; }
 
     /// <summary>
     /// When the task is due.
     /// </summary>
     [JsonPropertyName("due_date")]
-    public DateTime? DueDate { get; init; }
+    public DateTime? DueDate { get; set; }
 
     /// <summary>
     /// The task's status.
@@ -56,14 +55,14 @@ public class PatchedTaskRequest
     /// - `CLOSED` - CLOSED
     /// </summary>
     [JsonPropertyName("status")]
-    public TaskStatusEnum? Status { get; init; }
+    public TaskStatusEnum? Status { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PhoneNumber.cs b/src/Merge.Client/Crm/Types/PhoneNumber.cs
index 02a1cf43..0ee2ef8a 100644
--- a/src/Merge.Client/Crm/Types/PhoneNumber.cs
+++ b/src/Merge.Client/Crm/Types/PhoneNumber.cs
@@ -4,29 +4,29 @@
 
 namespace Merge.Client.Crm;
 
-public class PhoneNumber
+public record PhoneNumber
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The phone number.
     /// </summary>
     [JsonPropertyName("phone_number")]
-    public string? PhoneNumber_ { get; init; }
+    public string? PhoneNumber_ { get; set; }
 
     /// <summary>
     /// The phone number's type.
     /// </summary>
     [JsonPropertyName("phone_number_type")]
-    public string? PhoneNumberType { get; init; }
+    public string? PhoneNumberType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/PhoneNumberRequest.cs b/src/Merge.Client/Crm/Types/PhoneNumberRequest.cs
index f3611c8a..edfd0b31 100644
--- a/src/Merge.Client/Crm/Types/PhoneNumberRequest.cs
+++ b/src/Merge.Client/Crm/Types/PhoneNumberRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Crm;
 
-public class PhoneNumberRequest
+public record PhoneNumberRequest
 {
     /// <summary>
     /// The phone number.
     /// </summary>
     [JsonPropertyName("phone_number")]
-    public string? PhoneNumber { get; init; }
+    public string? PhoneNumber { get; set; }
 
     /// <summary>
     /// The phone number's type.
     /// </summary>
     [JsonPropertyName("phone_number_type")]
-    public string? PhoneNumberType { get; init; }
+    public string? PhoneNumberType { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ReasonEnum.cs b/src/Merge.Client/Crm/Types/ReasonEnum.cs
index 73cd4bd6..1f506263 100644
--- a/src/Merge.Client/Crm/Types/ReasonEnum.cs
+++ b/src/Merge.Client/Crm/Types/ReasonEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/RemoteData.cs b/src/Merge.Client/Crm/Types/RemoteData.cs
index 1558716c..e85cacd9 100644
--- a/src/Merge.Client/Crm/Types/RemoteData.cs
+++ b/src/Merge.Client/Crm/Types/RemoteData.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class RemoteData
+public record RemoteData
 {
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("data")]
-    public object? Data { get; init; }
+    public object? Data { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteEndpointInfo.cs b/src/Merge.Client/Crm/Types/RemoteEndpointInfo.cs
index 8229c95e..9a0fb9bb 100644
--- a/src/Merge.Client/Crm/Types/RemoteEndpointInfo.cs
+++ b/src/Merge.Client/Crm/Types/RemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class RemoteEndpointInfo
+public record RemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string UrlPath { get; init; }
+    public required string UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<object> FieldTraversalPath { get; init; }
+    public IEnumerable<object> FieldTraversalPath { get; set; } = new List<object>();
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteField.cs b/src/Merge.Client/Crm/Types/RemoteField.cs
index 042a6f47..9edaf95c 100644
--- a/src/Merge.Client/Crm/Types/RemoteField.cs
+++ b/src/Merge.Client/Crm/Types/RemoteField.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class RemoteField
+public record RemoteField
 {
     [JsonPropertyName("remote_field_class")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteFieldClass>>))]
-    public OneOf<string, RemoteFieldClass> RemoteFieldClass { get; init; }
+    public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }
 
     [JsonPropertyName("value")]
-    public object? Value { get; init; }
+    public object? Value { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteFieldApi.cs b/src/Merge.Client/Crm/Types/RemoteFieldApi.cs
index a2907ce4..93587405 100644
--- a/src/Merge.Client/Crm/Types/RemoteFieldApi.cs
+++ b/src/Merge.Client/Crm/Types/RemoteFieldApi.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class RemoteFieldApi
+public record RemoteFieldApi
 {
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("remote_endpoint_info")]
-    public RemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required RemoteEndpointInfo RemoteEndpointInfo { get; set; }
 
     [JsonPropertyName("example_values")]
-    public IEnumerable<object>? ExampleValues { get; init; }
+    public IEnumerable<object>? ExampleValues { get; set; }
 
     [JsonPropertyName("advanced_metadata")]
-    public AdvancedMetadata? AdvancedMetadata { get; init; }
+    public AdvancedMetadata? AdvancedMetadata { get; set; }
 
     [JsonPropertyName("coverage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<int, double>>))]
-    public OneOf<int, double>? Coverage { get; init; }
+    public OneOf<int, double>? Coverage { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteFieldApiResponse.cs b/src/Merge.Client/Crm/Types/RemoteFieldApiResponse.cs
index f6cb5fce..a3e6c4cc 100644
--- a/src/Merge.Client/Crm/Types/RemoteFieldApiResponse.cs
+++ b/src/Merge.Client/Crm/Types/RemoteFieldApiResponse.cs
@@ -1,36 +1,35 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class RemoteFieldApiResponse
+public record RemoteFieldApiResponse
 {
     [JsonPropertyName("Account")]
-    public IEnumerable<RemoteFieldApi>? Account { get; init; }
+    public IEnumerable<RemoteFieldApi>? Account { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<RemoteFieldApi>? Contact { get; init; }
+    public IEnumerable<RemoteFieldApi>? Contact { get; set; }
 
     [JsonPropertyName("Lead")]
-    public IEnumerable<RemoteFieldApi>? Lead { get; init; }
+    public IEnumerable<RemoteFieldApi>? Lead { get; set; }
 
     [JsonPropertyName("Note")]
-    public IEnumerable<RemoteFieldApi>? Note { get; init; }
+    public IEnumerable<RemoteFieldApi>? Note { get; set; }
 
     [JsonPropertyName("Opportunity")]
-    public IEnumerable<RemoteFieldApi>? Opportunity { get; init; }
+    public IEnumerable<RemoteFieldApi>? Opportunity { get; set; }
 
     [JsonPropertyName("Stage")]
-    public IEnumerable<RemoteFieldApi>? Stage { get; init; }
+    public IEnumerable<RemoteFieldApi>? Stage { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<RemoteFieldApi>? User { get; init; }
+    public IEnumerable<RemoteFieldApi>? User { get; set; }
 
     [JsonPropertyName("Task")]
-    public IEnumerable<RemoteFieldApi>? Task { get; init; }
+    public IEnumerable<RemoteFieldApi>? Task { get; set; }
 
     [JsonPropertyName("Engagement")]
-    public IEnumerable<RemoteFieldApi>? Engagement { get; init; }
+    public IEnumerable<RemoteFieldApi>? Engagement { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteFieldClass.cs b/src/Merge.Client/Crm/Types/RemoteFieldClass.cs
index 9319b037..9fc50fbb 100644
--- a/src/Merge.Client/Crm/Types/RemoteFieldClass.cs
+++ b/src/Merge.Client/Crm/Types/RemoteFieldClass.cs
@@ -1,39 +1,38 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class RemoteFieldClass
+public record RemoteFieldClass
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("remote_key_name")]
-    public string? RemoteKeyName { get; init; }
+    public string? RemoteKeyName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_custom")]
-    public bool? IsCustom { get; init; }
+    public bool? IsCustom { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("field_type")]
-    public FieldTypeEnum? FieldType { get; init; }
+    public FieldTypeEnum? FieldType { get; set; }
 
     [JsonPropertyName("field_format")]
-    public FieldFormatEnum? FieldFormat { get; init; }
+    public FieldFormatEnum? FieldFormat { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<RemoteFieldClassFieldChoicesItem>? FieldChoices { get; init; }
+    public IEnumerable<RemoteFieldClassFieldChoicesItem>? FieldChoices { get; set; }
 
     [JsonPropertyName("item_schema")]
-    public ItemSchema? ItemSchema { get; init; }
+    public ItemSchema? ItemSchema { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteFieldClassFieldChoicesItem.cs b/src/Merge.Client/Crm/Types/RemoteFieldClassFieldChoicesItem.cs
index a8dedc0d..b4481d1e 100644
--- a/src/Merge.Client/Crm/Types/RemoteFieldClassFieldChoicesItem.cs
+++ b/src/Merge.Client/Crm/Types/RemoteFieldClassFieldChoicesItem.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class RemoteFieldClassFieldChoicesItem
+public record RemoteFieldClassFieldChoicesItem
 {
     [JsonPropertyName("value")]
-    public object? Value { get; init; }
+    public object? Value { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClass.cs b/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClass.cs
index 7d27904c..0a90935e 100644
--- a/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClass.cs
+++ b/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClass.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class RemoteFieldClassForCustomObjectClass
+public record RemoteFieldClassForCustomObjectClass
 {
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("remote_key_name")]
-    public string? RemoteKeyName { get; init; }
+    public string? RemoteKeyName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("field_type")]
-    public FieldTypeEnum? FieldType { get; init; }
+    public FieldTypeEnum? FieldType { get; set; }
 
     [JsonPropertyName("field_format")]
-    public FieldFormatEnum? FieldFormat { get; init; }
+    public FieldFormatEnum? FieldFormat { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<RemoteFieldClassForCustomObjectClassFieldChoicesItem>? FieldChoices { get; init; }
+    public IEnumerable<RemoteFieldClassForCustomObjectClassFieldChoicesItem>? FieldChoices { get; set; }
 
     [JsonPropertyName("item_schema")]
-    public RemoteFieldClassForCustomObjectClassItemSchema? ItemSchema { get; init; }
+    public RemoteFieldClassForCustomObjectClassItemSchema? ItemSchema { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClassFieldChoicesItem.cs b/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClassFieldChoicesItem.cs
index 4051bfea..71aeda7f 100644
--- a/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClassFieldChoicesItem.cs
+++ b/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClassFieldChoicesItem.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class RemoteFieldClassForCustomObjectClassFieldChoicesItem
+public record RemoteFieldClassForCustomObjectClassFieldChoicesItem
 {
     [JsonPropertyName("value")]
-    public object? Value { get; init; }
+    public object? Value { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClassItemSchema.cs b/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClassItemSchema.cs
index f7d35646..7daf0a75 100644
--- a/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClassItemSchema.cs
+++ b/src/Merge.Client/Crm/Types/RemoteFieldClassForCustomObjectClassItemSchema.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class RemoteFieldClassForCustomObjectClassItemSchema
+public record RemoteFieldClassForCustomObjectClassItemSchema
 {
     [JsonPropertyName("item_type")]
-    public string? ItemType { get; init; }
+    public string? ItemType { get; set; }
 
     [JsonPropertyName("item_format")]
-    public string? ItemFormat { get; init; }
+    public string? ItemFormat { get; set; }
 
     [JsonPropertyName("item_choices")]
-    public IEnumerable<string>? ItemChoices { get; init; }
+    public IEnumerable<string>? ItemChoices { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteFieldRequest.cs b/src/Merge.Client/Crm/Types/RemoteFieldRequest.cs
index c881ac93..285f21ce 100644
--- a/src/Merge.Client/Crm/Types/RemoteFieldRequest.cs
+++ b/src/Merge.Client/Crm/Types/RemoteFieldRequest.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class RemoteFieldRequest
+public record RemoteFieldRequest
 {
     [JsonPropertyName("remote_field_class")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteFieldClass>>))]
-    public OneOf<string, RemoteFieldClass> RemoteFieldClass { get; init; }
+    public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }
 
     [JsonPropertyName("value")]
-    public object? Value { get; init; }
+    public object? Value { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteKey.cs b/src/Merge.Client/Crm/Types/RemoteKey.cs
index 1324474e..6fc5e63b 100644
--- a/src/Merge.Client/Crm/Types/RemoteKey.cs
+++ b/src/Merge.Client/Crm/Types/RemoteKey.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Crm;
 
-public class RemoteKey
+public record RemoteKey
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("key")]
-    public string Key { get; init; }
+    public required string Key { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RemoteResponse.cs b/src/Merge.Client/Crm/Types/RemoteResponse.cs
index 4fd68ed8..b9154fe5 100644
--- a/src/Merge.Client/Crm/Types/RemoteResponse.cs
+++ b/src/Merge.Client/Crm/Types/RemoteResponse.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class RemoteResponse
+public record RemoteResponse
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("status")]
-    public int Status { get; init; }
+    public required int Status { get; set; }
 
     [JsonPropertyName("response")]
-    public object Response { get; init; }
+    public required object Response { get; set; }
 
     [JsonPropertyName("response_headers")]
-    public Dictionary<string, object>? ResponseHeaders { get; init; }
+    public Dictionary<string, object?>? ResponseHeaders { get; set; }
 
     [JsonPropertyName("response_type")]
-    public ResponseTypeEnum? ResponseType { get; init; }
+    public ResponseTypeEnum? ResponseType { get; set; }
 
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/RequestFormatEnum.cs b/src/Merge.Client/Crm/Types/RequestFormatEnum.cs
index 7b8257f9..d727c500 100644
--- a/src/Merge.Client/Crm/Types/RequestFormatEnum.cs
+++ b/src/Merge.Client/Crm/Types/RequestFormatEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/ResponseTypeEnum.cs b/src/Merge.Client/Crm/Types/ResponseTypeEnum.cs
index 648cf80a..aa1a4d3d 100644
--- a/src/Merge.Client/Crm/Types/ResponseTypeEnum.cs
+++ b/src/Merge.Client/Crm/Types/ResponseTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/RoleEnum.cs b/src/Merge.Client/Crm/Types/RoleEnum.cs
index ad07e54b..3c0b736e 100644
--- a/src/Merge.Client/Crm/Types/RoleEnum.cs
+++ b/src/Merge.Client/Crm/Types/RoleEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/SelectiveSyncConfigurationsUsageEnum.cs b/src/Merge.Client/Crm/Types/SelectiveSyncConfigurationsUsageEnum.cs
index 362a8a6b..a73d96bf 100644
--- a/src/Merge.Client/Crm/Types/SelectiveSyncConfigurationsUsageEnum.cs
+++ b/src/Merge.Client/Crm/Types/SelectiveSyncConfigurationsUsageEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/Stage.cs b/src/Merge.Client/Crm/Types/Stage.cs
index 0861c732..58d6ffc2 100644
--- a/src/Merge.Client/Crm/Types/Stage.cs
+++ b/src/Merge.Client/Crm/Types/Stage.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Stage
+public record Stage
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The stage's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/SyncStatus.cs b/src/Merge.Client/Crm/Types/SyncStatus.cs
index 2f803c1e..b84a5d66 100644
--- a/src/Merge.Client/Crm/Types/SyncStatus.cs
+++ b/src/Merge.Client/Crm/Types/SyncStatus.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class SyncStatus
+public record SyncStatus
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("last_sync_start")]
-    public DateTime? LastSyncStart { get; init; }
+    public DateTime? LastSyncStart { get; set; }
 
     [JsonPropertyName("next_sync_start")]
-    public DateTime? NextSyncStart { get; init; }
+    public DateTime? NextSyncStart { get; set; }
 
     [JsonPropertyName("status")]
-    public SyncStatusStatusEnum Status { get; init; }
+    public required SyncStatusStatusEnum Status { get; set; }
 
     [JsonPropertyName("is_initial_sync")]
-    public bool IsInitialSync { get; init; }
+    public required bool IsInitialSync { get; set; }
 
     [JsonPropertyName("selective_sync_configurations_usage")]
-    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; init; }
+    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/SyncStatusStatusEnum.cs b/src/Merge.Client/Crm/Types/SyncStatusStatusEnum.cs
index 9c7cb6ac..0bd30e2d 100644
--- a/src/Merge.Client/Crm/Types/SyncStatusStatusEnum.cs
+++ b/src/Merge.Client/Crm/Types/SyncStatusStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/Task.cs b/src/Merge.Client/Crm/Types/Task.cs
index b15b1785..83bb52fc 100644
--- a/src/Merge.Client/Crm/Types/Task.cs
+++ b/src/Merge.Client/Crm/Types/Task.cs
@@ -1,79 +1,78 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class Task
+public record Task
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The task's subject.
     /// </summary>
     [JsonPropertyName("subject")]
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
 
     /// <summary>
     /// The task's content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// The task's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The task's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The task's opportunity.
     /// </summary>
     [JsonPropertyName("opportunity")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Opportunity>>))]
-    public OneOf<string, Opportunity>? Opportunity { get; init; }
+    public OneOf<string, Opportunity>? Opportunity { get; set; }
 
     /// <summary>
     /// When the task is completed.
     /// </summary>
     [JsonPropertyName("completed_date")]
-    public DateTime? CompletedDate { get; init; }
+    public DateTime? CompletedDate { get; set; }
 
     /// <summary>
     /// When the task is due.
     /// </summary>
     [JsonPropertyName("due_date")]
-    public DateTime? DueDate { get; init; }
+    public DateTime? DueDate { get; set; }
 
     /// <summary>
     /// The task's status.
@@ -82,20 +81,20 @@ public class Task
     /// - `CLOSED` - CLOSED
     /// </summary>
     [JsonPropertyName("status")]
-    public TaskStatusEnum? Status { get; init; }
+    public TaskStatusEnum? Status { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/TaskRequest.cs b/src/Merge.Client/Crm/Types/TaskRequest.cs
index 46b1b87c..bb0b7b50 100644
--- a/src/Merge.Client/Crm/Types/TaskRequest.cs
+++ b/src/Merge.Client/Crm/Types/TaskRequest.cs
@@ -1,58 +1,57 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class TaskRequest
+public record TaskRequest
 {
     /// <summary>
     /// The task's subject.
     /// </summary>
     [JsonPropertyName("subject")]
-    public string? Subject { get; init; }
+    public string? Subject { get; set; }
 
     /// <summary>
     /// The task's content.
     /// </summary>
     [JsonPropertyName("content")]
-    public string? Content { get; init; }
+    public string? Content { get; set; }
 
     /// <summary>
     /// The task's owner.
     /// </summary>
     [JsonPropertyName("owner")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Owner { get; init; }
+    public OneOf<string, User>? Owner { get; set; }
 
     /// <summary>
     /// The task's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The task's opportunity.
     /// </summary>
     [JsonPropertyName("opportunity")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Opportunity>>))]
-    public OneOf<string, Opportunity>? Opportunity { get; init; }
+    public OneOf<string, Opportunity>? Opportunity { get; set; }
 
     /// <summary>
     /// When the task is completed.
     /// </summary>
     [JsonPropertyName("completed_date")]
-    public DateTime? CompletedDate { get; init; }
+    public DateTime? CompletedDate { get; set; }
 
     /// <summary>
     /// When the task is due.
     /// </summary>
     [JsonPropertyName("due_date")]
-    public DateTime? DueDate { get; init; }
+    public DateTime? DueDate { get; set; }
 
     /// <summary>
     /// The task's status.
@@ -61,14 +60,14 @@ public class TaskRequest
     /// - `CLOSED` - CLOSED
     /// </summary>
     [JsonPropertyName("status")]
-    public TaskStatusEnum? Status { get; init; }
+    public TaskStatusEnum? Status { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/TaskResponse.cs b/src/Merge.Client/Crm/Types/TaskResponse.cs
index d167dd50..61a92498 100644
--- a/src/Merge.Client/Crm/Types/TaskResponse.cs
+++ b/src/Merge.Client/Crm/Types/TaskResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class TaskResponse
+public record TaskResponse
 {
     [JsonPropertyName("model")]
-    public Task Model { get; init; }
+    public required Task Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/TaskStatusEnum.cs b/src/Merge.Client/Crm/Types/TaskStatusEnum.cs
index a6126934..c39bb7d6 100644
--- a/src/Merge.Client/Crm/Types/TaskStatusEnum.cs
+++ b/src/Merge.Client/Crm/Types/TaskStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Crm;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Crm/Types/User.cs b/src/Merge.Client/Crm/Types/User.cs
index 6a5b4abe..7240fdd2 100644
--- a/src/Merge.Client/Crm/Types/User.cs
+++ b/src/Merge.Client/Crm/Types/User.cs
@@ -1,63 +1,62 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class User
+public record User
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The user's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The user's email address.
     /// </summary>
     [JsonPropertyName("email")]
-    public string? Email { get; init; }
+    public string? Email { get; set; }
 
     /// <summary>
     /// Whether or not the user is active.
     /// </summary>
     [JsonPropertyName("is_active")]
-    public bool? IsActive { get; init; }
+    public bool? IsActive { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/ValidationProblemSource.cs b/src/Merge.Client/Crm/Types/ValidationProblemSource.cs
index 12a7b068..23cad5a2 100644
--- a/src/Merge.Client/Crm/Types/ValidationProblemSource.cs
+++ b/src/Merge.Client/Crm/Types/ValidationProblemSource.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Crm;
 
-public class ValidationProblemSource
+public record ValidationProblemSource
 {
     [JsonPropertyName("pointer")]
-    public string Pointer { get; init; }
+    public required string Pointer { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/WarningValidationProblem.cs b/src/Merge.Client/Crm/Types/WarningValidationProblem.cs
index 44ded968..fba1f934 100644
--- a/src/Merge.Client/Crm/Types/WarningValidationProblem.cs
+++ b/src/Merge.Client/Crm/Types/WarningValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Crm;
 
 #nullable enable
 
 namespace Merge.Client.Crm;
 
-public class WarningValidationProblem
+public record WarningValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Types/WebhookReceiver.cs b/src/Merge.Client/Crm/Types/WebhookReceiver.cs
index d4a370d3..f2e9a38b 100644
--- a/src/Merge.Client/Crm/Types/WebhookReceiver.cs
+++ b/src/Merge.Client/Crm/Types/WebhookReceiver.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class WebhookReceiver
+public record WebhookReceiver
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Users/Requests/UsersListRequest.cs b/src/Merge.Client/Crm/Users/Requests/UsersListRequest.cs
index 0d4fe345..c9c39283 100644
--- a/src/Merge.Client/Crm/Users/Requests/UsersListRequest.cs
+++ b/src/Merge.Client/Crm/Users/Requests/UsersListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Crm;
 
-public class UsersListRequest
+public record UsersListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Users/Requests/UsersRemoteFieldClassesListRequest.cs b/src/Merge.Client/Crm/Users/Requests/UsersRemoteFieldClassesListRequest.cs
index 360a5fff..e61e8786 100644
--- a/src/Merge.Client/Crm/Users/Requests/UsersRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Crm/Users/Requests/UsersRemoteFieldClassesListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Crm;
 
-public class UsersRemoteFieldClassesListRequest
+public record UsersRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Users/Requests/UsersRetrieveRequest.cs b/src/Merge.Client/Crm/Users/Requests/UsersRetrieveRequest.cs
index df367740..e5790033 100644
--- a/src/Merge.Client/Crm/Users/Requests/UsersRetrieveRequest.cs
+++ b/src/Merge.Client/Crm/Users/Requests/UsersRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Crm;
 
-public class UsersRetrieveRequest
+public record UsersRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Crm/Users/UsersClient.cs b/src/Merge.Client/Crm/Users/UsersClient.cs
index 2857a25e..74da1787 100644
--- a/src/Merge.Client/Crm/Users/UsersClient.cs
+++ b/src/Merge.Client/Crm/Users/UsersClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public UsersClient(RawClient client)
     /// <summary>
     /// Returns a list of `User` objects.
     /// </summary>
-    public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
+    public async Task<PaginatedUserList> ListAsync(
+        UsersListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -64,23 +73,41 @@ public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/users",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedUserList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedUserList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `User` object with the given `id`.
     /// </summary>
-    public async Task<User> RetrieveAsync(string id, UsersRetrieveRequest request)
+    public async Task<User> RetrieveAsync(
+        string id,
+        UsersRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -94,39 +121,70 @@ public async Task<User> RetrieveAsync(string id, UsersRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"crm/v1/users/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<User>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<User>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Ignores a specific row based on the `model_id` in the url. These records will have their properties set to null, and will not be updated in future syncs. The "reason" and "message" fields in the request body will be stored for audit purposes.
     /// </summary>
-    public async void IgnoreCreateAsync(string modelId, IgnoreCommonModelRequest request)
+    public async Task IgnoreCreateAsync(
+        string modelId,
+        IgnoreCommonModelRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = $"crm/v1/users/ignore/{modelId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        UsersRemoteFieldClassesListRequest request
+        UsersRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -157,16 +215,30 @@ UsersRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "crm/v1/users/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Crm/WebhookReceivers/Requests/WebhookReceiverRequest.cs b/src/Merge.Client/Crm/WebhookReceivers/Requests/WebhookReceiverRequest.cs
index 85a1efd1..bfac8ffc 100644
--- a/src/Merge.Client/Crm/WebhookReceivers/Requests/WebhookReceiverRequest.cs
+++ b/src/Merge.Client/Crm/WebhookReceivers/Requests/WebhookReceiverRequest.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Crm;
 
-public class WebhookReceiverRequest
+public record WebhookReceiverRequest
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Crm/WebhookReceivers/WebhookReceiversClient.cs b/src/Merge.Client/Crm/WebhookReceivers/WebhookReceiversClient.cs
index b8d2c3ba..9f386415 100644
--- a/src/Merge.Client/Crm/WebhookReceivers/WebhookReceiversClient.cs
+++ b/src/Merge.Client/Crm/WebhookReceivers/WebhookReceiversClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Crm;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,72 @@ public WebhookReceiversClient(RawClient client)
     /// <summary>
     /// Returns a list of `WebhookReceiver` objects.
     /// </summary>
-    public async Task<IEnumerable<WebhookReceiver>> ListAsync()
+    public async Task<IEnumerable<WebhookReceiver>> ListAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "crm/v1/webhook-receivers"
+                Path = "crm/v1/webhook-receivers",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<WebhookReceiver>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<WebhookReceiver>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `WebhookReceiver` object with the given values.
     /// </summary>
-    public async Task<WebhookReceiver> CreateAsync(WebhookReceiverRequest request)
+    public async Task<WebhookReceiver> CreateAsync(
+        WebhookReceiverRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "crm/v1/webhook-receivers",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<WebhookReceiver>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<WebhookReceiver>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/AccountDetails/AccountDetailsClient.cs b/src/Merge.Client/Filestorage/AccountDetails/AccountDetailsClient.cs
index 412a1682..93c6065a 100644
--- a/src/Merge.Client/Filestorage/AccountDetails/AccountDetailsClient.cs
+++ b/src/Merge.Client/Filestorage/AccountDetails/AccountDetailsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AccountDetailsClient(RawClient client)
     /// <summary>
     /// Get details for a linked account.
     /// </summary>
-    public async Task<AccountDetails> RetrieveAsync()
+    public async Task<AccountDetails> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/account-details"
+                Path = "filestorage/v1/account-details",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountDetails>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountDetails>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/AccountToken/AccountTokenClient.cs b/src/Merge.Client/Filestorage/AccountToken/AccountTokenClient.cs
index 64ae04ad..b4a1a412 100644
--- a/src/Merge.Client/Filestorage/AccountToken/AccountTokenClient.cs
+++ b/src/Merge.Client/Filestorage/AccountToken/AccountTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,37 @@ public AccountTokenClient(RawClient client)
     /// <summary>
     /// Returns the account token for the end user with the provided public token.
     /// </summary>
-    public async Task<AccountToken> RetrieveAsync(string publicToken)
+    public async Task<AccountToken> RetrieveAsync(
+        string publicToken,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"filestorage/v1/account-token/{publicToken}"
+                Path = $"filestorage/v1/account-token/{publicToken}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/AsyncPassthrough/AsyncPassthroughClient.cs b/src/Merge.Client/Filestorage/AsyncPassthrough/AsyncPassthroughClient.cs
index cf05535b..686da4c7 100644
--- a/src/Merge.Client/Filestorage/AsyncPassthrough/AsyncPassthroughClient.cs
+++ b/src/Merge.Client/Filestorage/AsyncPassthrough/AsyncPassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,75 @@ public AsyncPassthroughClient(RawClient client)
     /// <summary>
     /// Asynchronously pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<AsyncPassthroughReciept> CreateAsync(DataPassthroughRequest request)
+    public async Task<AsyncPassthroughReciept> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/async-passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AsyncPassthroughReciept>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AsyncPassthroughReciept>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Retrieves data from earlier async-passthrough POST request
     /// </summary>
-    public async Task<RemoteResponse> RetrieveAsync(string asyncPassthroughReceiptId)
+    public async Task<RemoteResponse> RetrieveAsync(
+        string asyncPassthroughReceiptId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"filestorage/v1/async-passthrough/{asyncPassthroughReceiptId}"
+                Path = $"filestorage/v1/async-passthrough/{asyncPassthroughReceiptId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/AuditTrail/AuditTrailClient.cs b/src/Merge.Client/Filestorage/AuditTrail/AuditTrailClient.cs
index 412aeeb4..5cd5b66c 100644
--- a/src/Merge.Client/Filestorage/AuditTrail/AuditTrailClient.cs
+++ b/src/Merge.Client/Filestorage/AuditTrail/AuditTrailClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AuditTrailClient(RawClient client)
     /// <summary>
     /// Gets a list of audit trail events.
     /// </summary>
-    public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest request)
+    public async Task<PaginatedAuditLogEventList> ListAsync(
+        AuditTrailListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -48,16 +51,30 @@ public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/audit-trail",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAuditLogEventList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAuditLogEventList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/AuditTrail/Requests/AuditTrailListRequest.cs b/src/Merge.Client/Filestorage/AuditTrail/Requests/AuditTrailListRequest.cs
index 10136bd4..2d649e63 100644
--- a/src/Merge.Client/Filestorage/AuditTrail/Requests/AuditTrailListRequest.cs
+++ b/src/Merge.Client/Filestorage/AuditTrail/Requests/AuditTrailListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Filestorage;
 
-public class AuditTrailListRequest
+public record AuditTrailListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
     /// <summary>
     /// If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`, `END_USER_CREDENTIALS_ACCESSED`
     /// </summary>
-    public string? EventType { get; init; }
+    public string? EventType { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// If provided, this will return events associated with the specified user email. Please note that the email address reflects the user's email at the time of the event, and may not be their current email.
     /// </summary>
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/AvailableActions/AvailableActionsClient.cs b/src/Merge.Client/Filestorage/AvailableActions/AvailableActionsClient.cs
index 4294ff7a..1e73a8fd 100644
--- a/src/Merge.Client/Filestorage/AvailableActions/AvailableActionsClient.cs
+++ b/src/Merge.Client/Filestorage/AvailableActions/AvailableActionsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AvailableActionsClient(RawClient client)
     /// <summary>
     /// Returns a list of models and actions available for an account.
     /// </summary>
-    public async Task<AvailableActions> RetrieveAsync()
+    public async Task<AvailableActions> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/available-actions"
+                Path = "filestorage/v1/available-actions",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AvailableActions>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AvailableActions>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/DeleteAccount/DeleteAccountClient.cs b/src/Merge.Client/Filestorage/DeleteAccount/DeleteAccountClient.cs
index a43935cf..ecaf7702 100644
--- a/src/Merge.Client/Filestorage/DeleteAccount/DeleteAccountClient.cs
+++ b/src/Merge.Client/Filestorage/DeleteAccount/DeleteAccountClient.cs
@@ -1,4 +1,5 @@
-using Merge.Client;
+using System.Net.Http;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -16,14 +17,26 @@ public DeleteAccountClient(RawClient client)
     /// <summary>
     /// Delete a linked account.
     /// </summary>
-    public async void DeleteAsync()
+    public async Task DeleteAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "filestorage/v1/delete-account"
+                Path = "filestorage/v1/delete-account",
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/Drives/DrivesClient.cs b/src/Merge.Client/Filestorage/Drives/DrivesClient.cs
index f451db63..d56b2728 100644
--- a/src/Merge.Client/Filestorage/Drives/DrivesClient.cs
+++ b/src/Merge.Client/Filestorage/Drives/DrivesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public DrivesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Drive` objects.
     /// </summary>
-    public async Task<PaginatedDriveList> ListAsync(DrivesListRequest request)
+    public async Task<PaginatedDriveList> ListAsync(
+        DrivesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedDriveList> ListAsync(DrivesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Name != null)
         {
@@ -64,23 +73,41 @@ public async Task<PaginatedDriveList> ListAsync(DrivesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/drives",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedDriveList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedDriveList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Drive` object with the given `id`.
     /// </summary>
-    public async Task<Drive> RetrieveAsync(string id, DrivesRetrieveRequest request)
+    public async Task<Drive> RetrieveAsync(
+        string id,
+        DrivesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -90,16 +117,30 @@ public async Task<Drive> RetrieveAsync(string id, DrivesRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"filestorage/v1/drives/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Drive>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Drive>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/Drives/Requests/DrivesListRequest.cs b/src/Merge.Client/Filestorage/Drives/Requests/DrivesListRequest.cs
index 227ae14d..ecbddee1 100644
--- a/src/Merge.Client/Filestorage/Drives/Requests/DrivesListRequest.cs
+++ b/src/Merge.Client/Filestorage/Drives/Requests/DrivesListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Filestorage;
 
-public class DrivesListRequest
+public record DrivesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return drives with this name. This performs an exact match.
     /// </summary>
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Drives/Requests/DrivesRetrieveRequest.cs b/src/Merge.Client/Filestorage/Drives/Requests/DrivesRetrieveRequest.cs
index b2d5d28b..175349b0 100644
--- a/src/Merge.Client/Filestorage/Drives/Requests/DrivesRetrieveRequest.cs
+++ b/src/Merge.Client/Filestorage/Drives/Requests/DrivesRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Filestorage;
 
-public class DrivesRetrieveRequest
+public record DrivesRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/FieldMapping/FieldMappingClient.cs b/src/Merge.Client/Filestorage/FieldMapping/FieldMappingClient.cs
index 6e69bb5b..412e2198 100644
--- a/src/Merge.Client/Filestorage/FieldMapping/FieldMappingClient.cs
+++ b/src/Merge.Client/Filestorage/FieldMapping/FieldMappingClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,64 +18,112 @@ public FieldMappingClient(RawClient client)
     /// <summary>
     /// Get all Field Mappings for this Linked Account. Field Mappings are mappings between third-party Remote Fields and user defined Merge fields. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
-    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync()
+    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/field-mappings"
+                Path = "filestorage/v1/field-mappings",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingApiInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingApiInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Create new Field Mappings that will be available after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsCreateAsync(
-        CreateFieldMappingRequest request
+        CreateFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/field-mappings",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Deletes Field Mappings for a Linked Account. All data related to this Field Mapping will be deleted and these changes will be reflected after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
-    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string fieldMappingId)
+    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(
+        string fieldMappingId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Delete,
-                Path = $"filestorage/v1/field-mappings/{fieldMappingId}"
+                Path = $"filestorage/v1/field-mappings/{fieldMappingId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -83,30 +131,46 @@ public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsPartialUpdateAsync(
         string fieldMappingId,
-        PatchedEditFieldMappingRequest request
+        PatchedEditFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"filestorage/v1/field-mappings/{fieldMappingId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all remote fields for a Linked Account. Remote fields are third-party fields that are accessible after initial sync if remote_data is enabled. You can use remote fields to override existing Merge fields or map a new Merge field. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
     public async Task<RemoteFieldApiResponse> RemoteFieldsRetrieveAsync(
-        RemoteFieldsRetrieveRequest request
+        RemoteFieldsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -121,36 +185,66 @@ RemoteFieldsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/remote-fields",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all organization-wide Target Fields, this will not include any Linked Account specific Target Fields. Organization-wide Target Fields are additional fields appended to the Merge Common Model for all Linked Accounts in a category. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/target-fields/).
     /// </summary>
-    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync()
+    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/target-fields"
+                Path = "filestorage/v1/target-fields",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ExternalTargetFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ExternalTargetFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/FieldMapping/Requests/CreateFieldMappingRequest.cs b/src/Merge.Client/Filestorage/FieldMapping/Requests/CreateFieldMappingRequest.cs
index 9d58c325..cfb3befc 100644
--- a/src/Merge.Client/Filestorage/FieldMapping/Requests/CreateFieldMappingRequest.cs
+++ b/src/Merge.Client/Filestorage/FieldMapping/Requests/CreateFieldMappingRequest.cs
@@ -4,41 +4,41 @@
 
 namespace Merge.Client.Filestorage;
 
-public class CreateFieldMappingRequest
+public record CreateFieldMappingRequest
 {
     /// <summary>
     /// The name of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_name")]
-    public string TargetFieldName { get; init; }
+    public required string TargetFieldName { get; set; }
 
     /// <summary>
     /// The description of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_description")]
-    public string TargetFieldDescription { get; init; }
+    public required string TargetFieldDescription { get; set; }
 
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object> RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object> RemoteFieldTraversalPath { get; set; } = new List<object>();
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string RemoteMethod { get; init; }
+    public required string RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string RemoteUrlPath { get; init; }
+    public required string RemoteUrlPath { get; set; }
 
     /// <summary>
     /// The name of the Common Model that the remote field corresponds to in a given category.
     /// </summary>
     [JsonPropertyName("common_model_name")]
-    public string CommonModelName { get; init; }
+    public required string CommonModelName { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs b/src/Merge.Client/Filestorage/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
index b4c20f20..3ec64787 100644
--- a/src/Merge.Client/Filestorage/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
+++ b/src/Merge.Client/Filestorage/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Filestorage;
 
-public class PatchedEditFieldMappingRequest
+public record PatchedEditFieldMappingRequest
 {
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object>? RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object>? RemoteFieldTraversalPath { get; set; }
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string? RemoteMethod { get; init; }
+    public string? RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string? RemoteUrlPath { get; init; }
+    public string? RemoteUrlPath { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs b/src/Merge.Client/Filestorage/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
index fe23658d..0cd64a8f 100644
--- a/src/Merge.Client/Filestorage/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
+++ b/src/Merge.Client/Filestorage/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Filestorage;
 
-public class RemoteFieldsRetrieveRequest
+public record RemoteFieldsRetrieveRequest
 {
     /// <summary>
     /// A comma seperated list of Common Model names. If included, will only return Remote Fields for those Common Models.
     /// </summary>
-    public string? CommonModels { get; init; }
+    public string? CommonModels { get; set; }
 
     /// <summary>
     /// If true, will include example values, where available, for remote fields in the 3rd party platform. These examples come from active data from your customers.
     /// </summary>
-    public string? IncludeExampleValues { get; init; }
+    public string? IncludeExampleValues { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Files/FilesClient.cs b/src/Merge.Client/Filestorage/Files/FilesClient.cs
index 1ddb37cb..e9445e08 100644
--- a/src/Merge.Client/Filestorage/Files/FilesClient.cs
+++ b/src/Merge.Client/Filestorage/Files/FilesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public FilesClient(RawClient client)
     /// <summary>
     /// Returns a list of `File` objects.
     /// </summary>
-    public async Task<PaginatedFileList> ListAsync(FilesListRequest request)
+    public async Task<PaginatedFileList> ListAsync(
+        FilesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedFileList> ListAsync(FilesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Name != null)
         {
@@ -80,23 +89,40 @@ public async Task<PaginatedFileList> ListAsync(FilesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/files",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedFileList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedFileList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `File` object with the given values.
     /// </summary>
-    public async Task<FileStorageFileResponse> CreateAsync(FileStorageFileEndpointRequest request)
+    public async Task<FileStorageFileResponse> CreateAsync(
+        FileStorageFileEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -110,23 +136,41 @@ public async Task<FileStorageFileResponse> CreateAsync(FileStorageFileEndpointRe
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/files",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FileStorageFileResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FileStorageFileResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `File` object with the given `id`.
     /// </summary>
-    public async Task<File> RetrieveAsync(string id, FilesRetrieveRequest request)
+    public async Task<File> RetrieveAsync(
+        string id,
+        FilesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -140,23 +184,41 @@ public async Task<File> RetrieveAsync(string id, FilesRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"filestorage/v1/files/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<File>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<File>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns the `File` content with the given `id` as a stream of bytes.
     /// </summary>
-    public async void DownloadRetrieveAsync(string id, FilesDownloadRetrieveRequest request)
+    public async Task DownloadRetrieveAsync(
+        string id,
+        FilesDownloadRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.MimeType != null)
@@ -166,30 +228,52 @@ public async void DownloadRetrieveAsync(string id, FilesDownloadRetrieveRequest
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"filestorage/v1/files/{id}/download",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `FileStorageFile` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/files/meta/post"
+                Path = "filestorage/v1/files/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/Files/Requests/FileStorageFileEndpointRequest.cs b/src/Merge.Client/Filestorage/Files/Requests/FileStorageFileEndpointRequest.cs
index 12af152b..4065a682 100644
--- a/src/Merge.Client/Filestorage/Files/Requests/FileStorageFileEndpointRequest.cs
+++ b/src/Merge.Client/Filestorage/Files/Requests/FileStorageFileEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Filestorage;
-
-#nullable enable
-
 namespace Merge.Client.Filestorage;
 
-public class FileStorageFileEndpointRequest
+public record FileStorageFileEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public FileRequest Model { get; init; }
+    public required FileRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Files/Requests/FilesDownloadRetrieveRequest.cs b/src/Merge.Client/Filestorage/Files/Requests/FilesDownloadRetrieveRequest.cs
index 9871f6d3..b1bc5b14 100644
--- a/src/Merge.Client/Filestorage/Files/Requests/FilesDownloadRetrieveRequest.cs
+++ b/src/Merge.Client/Filestorage/Files/Requests/FilesDownloadRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Filestorage;
 
-public class FilesDownloadRetrieveRequest
+public record FilesDownloadRetrieveRequest
 {
     /// <summary>
     /// If provided, specifies the export format of the file to be downloaded. For information on supported export formats, please refer to our <a href='https://help.merge.dev/en/articles/8615316-file-export-and-download-specification' target='_blank'>export format help center article</a>.
     /// </summary>
-    public string? MimeType { get; init; }
+    public string? MimeType { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Files/Requests/FilesListRequest.cs b/src/Merge.Client/Filestorage/Files/Requests/FilesListRequest.cs
index 79687258..0feb3979 100644
--- a/src/Merge.Client/Filestorage/Files/Requests/FilesListRequest.cs
+++ b/src/Merge.Client/Filestorage/Files/Requests/FilesListRequest.cs
@@ -1,78 +1,74 @@
-using Merge.Client.Filestorage;
-
-#nullable enable
-
 namespace Merge.Client.Filestorage;
 
-public class FilesListRequest
+public record FilesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Specifying a drive id returns only the files in that drive. Specifying null returns only the files outside the top-level drive.
     /// </summary>
-    public string? DriveId { get; init; }
+    public string? DriveId { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public FilesListRequestExpand? Expand { get; init; }
+    public FilesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Specifying a folder id returns only the files in that folder. Specifying null returns only the files in root directory.
     /// </summary>
-    public string? FolderId { get; init; }
+    public string? FolderId { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return files with these mime_types. Multiple values can be separated by commas.
     /// </summary>
-    public string? MimeType { get; init; }
+    public string? MimeType { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return files with this name. This performs an exact match.
     /// </summary>
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Files/Requests/FilesRetrieveRequest.cs b/src/Merge.Client/Filestorage/Files/Requests/FilesRetrieveRequest.cs
index e3a1a103..12d6af3d 100644
--- a/src/Merge.Client/Filestorage/Files/Requests/FilesRetrieveRequest.cs
+++ b/src/Merge.Client/Filestorage/Files/Requests/FilesRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Filestorage;
-
-#nullable enable
-
 namespace Merge.Client.Filestorage;
 
-public class FilesRetrieveRequest
+public record FilesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public FilesRetrieveRequestExpand? Expand { get; init; }
+    public FilesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Files/Types/FilesListRequestExpand.cs b/src/Merge.Client/Filestorage/Files/Types/FilesListRequestExpand.cs
index da845d7b..732c8518 100644
--- a/src/Merge.Client/Filestorage/Files/Types/FilesListRequestExpand.cs
+++ b/src/Merge.Client/Filestorage/Files/Types/FilesListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Files/Types/FilesRetrieveRequestExpand.cs b/src/Merge.Client/Filestorage/Files/Types/FilesRetrieveRequestExpand.cs
index e7344d7e..c7346ef4 100644
--- a/src/Merge.Client/Filestorage/Files/Types/FilesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Filestorage/Files/Types/FilesRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/FilestorageClient.cs b/src/Merge.Client/Filestorage/FilestorageClient.cs
index 13c285c4..9edca3a4 100644
--- a/src/Merge.Client/Filestorage/FilestorageClient.cs
+++ b/src/Merge.Client/Filestorage/FilestorageClient.cs
@@ -1,5 +1,4 @@
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Folders/FoldersClient.cs b/src/Merge.Client/Filestorage/Folders/FoldersClient.cs
index 9204e1f0..650b16ad 100644
--- a/src/Merge.Client/Filestorage/Folders/FoldersClient.cs
+++ b/src/Merge.Client/Filestorage/Folders/FoldersClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public FoldersClient(RawClient client)
     /// <summary>
     /// Returns a list of `Folder` objects.
     /// </summary>
-    public async Task<PaginatedFolderList> ListAsync(FoldersListRequest request)
+    public async Task<PaginatedFolderList> ListAsync(
+        FoldersListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedFolderList> ListAsync(FoldersListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Name != null)
         {
@@ -76,24 +85,39 @@ public async Task<PaginatedFolderList> ListAsync(FoldersListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/folders",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedFolderList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedFolderList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Folder` object with the given values.
     /// </summary>
     public async Task<FileStorageFolderResponse> CreateAsync(
-        FileStorageFolderEndpointRequest request
+        FileStorageFolderEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -108,23 +132,41 @@ FileStorageFolderEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/folders",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FileStorageFolderResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FileStorageFolderResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Folder` object with the given `id`.
     /// </summary>
-    public async Task<Folder> RetrieveAsync(string id, FoldersRetrieveRequest request)
+    public async Task<Folder> RetrieveAsync(
+        string id,
+        FoldersRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -138,36 +180,64 @@ public async Task<Folder> RetrieveAsync(string id, FoldersRetrieveRequest reques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"filestorage/v1/folders/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Folder>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Folder>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `FileStorageFolder` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/folders/meta/post"
+                Path = "filestorage/v1/folders/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/Folders/Requests/FileStorageFolderEndpointRequest.cs b/src/Merge.Client/Filestorage/Folders/Requests/FileStorageFolderEndpointRequest.cs
index 49ea9e6c..a6162954 100644
--- a/src/Merge.Client/Filestorage/Folders/Requests/FileStorageFolderEndpointRequest.cs
+++ b/src/Merge.Client/Filestorage/Folders/Requests/FileStorageFolderEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Filestorage;
-
-#nullable enable
-
 namespace Merge.Client.Filestorage;
 
-public class FileStorageFolderEndpointRequest
+public record FileStorageFolderEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public FolderRequest Model { get; init; }
+    public required FolderRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Folders/Requests/FoldersListRequest.cs b/src/Merge.Client/Filestorage/Folders/Requests/FoldersListRequest.cs
index fe3714a9..2c3b633d 100644
--- a/src/Merge.Client/Filestorage/Folders/Requests/FoldersListRequest.cs
+++ b/src/Merge.Client/Filestorage/Folders/Requests/FoldersListRequest.cs
@@ -1,73 +1,69 @@
-using Merge.Client.Filestorage;
-
-#nullable enable
-
 namespace Merge.Client.Filestorage;
 
-public class FoldersListRequest
+public record FoldersListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return folders in this drive.
     /// </summary>
-    public string? DriveId { get; init; }
+    public string? DriveId { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public FoldersListRequestExpand? Expand { get; init; }
+    public FoldersListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return folders with this name. This performs an exact match.
     /// </summary>
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return folders in this parent folder. If null, will return folders in root directory.
     /// </summary>
-    public string? ParentFolderId { get; init; }
+    public string? ParentFolderId { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Folders/Requests/FoldersRetrieveRequest.cs b/src/Merge.Client/Filestorage/Folders/Requests/FoldersRetrieveRequest.cs
index 327595c6..a56234d0 100644
--- a/src/Merge.Client/Filestorage/Folders/Requests/FoldersRetrieveRequest.cs
+++ b/src/Merge.Client/Filestorage/Folders/Requests/FoldersRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Filestorage;
-
-#nullable enable
-
 namespace Merge.Client.Filestorage;
 
-public class FoldersRetrieveRequest
+public record FoldersRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public FoldersRetrieveRequestExpand? Expand { get; init; }
+    public FoldersRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Folders/Types/FoldersListRequestExpand.cs b/src/Merge.Client/Filestorage/Folders/Types/FoldersListRequestExpand.cs
index d6ddac62..d1679f63 100644
--- a/src/Merge.Client/Filestorage/Folders/Types/FoldersListRequestExpand.cs
+++ b/src/Merge.Client/Filestorage/Folders/Types/FoldersListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Folders/Types/FoldersRetrieveRequestExpand.cs b/src/Merge.Client/Filestorage/Folders/Types/FoldersRetrieveRequestExpand.cs
index b8932f60..f7bf26f1 100644
--- a/src/Merge.Client/Filestorage/Folders/Types/FoldersRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Filestorage/Folders/Types/FoldersRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/ForceResync/ForceResyncClient.cs b/src/Merge.Client/Filestorage/ForceResync/ForceResyncClient.cs
index bee403dd..0198221d 100644
--- a/src/Merge.Client/Filestorage/ForceResync/ForceResyncClient.cs
+++ b/src/Merge.Client/Filestorage/ForceResync/ForceResyncClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,36 @@ public ForceResyncClient(RawClient client)
     /// <summary>
     /// Force re-sync of all models. This is available for all organizations via the dashboard. Force re-sync is also available programmatically via API for monthly, quarterly, and highest sync frequency customers on the Launch, Professional, or Enterprise plans. Doing so will consume a sync credit for the relevant linked account.
     /// </summary>
-    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync()
+    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "filestorage/v1/sync-status/resync"
+                Path = "filestorage/v1/sync-status/resync",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<SyncStatus>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<SyncStatus>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/GenerateKey/GenerateKeyClient.cs b/src/Merge.Client/Filestorage/GenerateKey/GenerateKeyClient.cs
index be89818d..9b1e4b16 100644
--- a/src/Merge.Client/Filestorage/GenerateKey/GenerateKeyClient.cs
+++ b/src/Merge.Client/Filestorage/GenerateKey/GenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public GenerateKeyClient(RawClient client)
     /// <summary>
     /// Create a remote key.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(GenerateRemoteKeyRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        GenerateRemoteKeyRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/generate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/GenerateKey/Requests/GenerateRemoteKeyRequest.cs b/src/Merge.Client/Filestorage/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
index 34a7ad87..234c6c34 100644
--- a/src/Merge.Client/Filestorage/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
+++ b/src/Merge.Client/Filestorage/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Filestorage;
 
-public class GenerateRemoteKeyRequest
+public record GenerateRemoteKeyRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Groups/GroupsClient.cs b/src/Merge.Client/Filestorage/Groups/GroupsClient.cs
index be0b031c..696e5865 100644
--- a/src/Merge.Client/Filestorage/Groups/GroupsClient.cs
+++ b/src/Merge.Client/Filestorage/Groups/GroupsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public GroupsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Group` objects.
     /// </summary>
-    public async Task<PaginatedGroupList> ListAsync(GroupsListRequest request)
+    public async Task<PaginatedGroupList> ListAsync(
+        GroupsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedGroupList> ListAsync(GroupsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedGroupList> ListAsync(GroupsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/groups",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedGroupList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedGroupList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Group` object with the given `id`.
     /// </summary>
-    public async Task<Group> RetrieveAsync(string id, GroupsRetrieveRequest request)
+    public async Task<Group> RetrieveAsync(
+        string id,
+        GroupsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<Group> RetrieveAsync(string id, GroupsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"filestorage/v1/groups/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Group>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Group>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/Groups/Requests/GroupsListRequest.cs b/src/Merge.Client/Filestorage/Groups/Requests/GroupsListRequest.cs
index f6032bf4..7546bf61 100644
--- a/src/Merge.Client/Filestorage/Groups/Requests/GroupsListRequest.cs
+++ b/src/Merge.Client/Filestorage/Groups/Requests/GroupsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Filestorage;
 
-public class GroupsListRequest
+public record GroupsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Groups/Requests/GroupsRetrieveRequest.cs b/src/Merge.Client/Filestorage/Groups/Requests/GroupsRetrieveRequest.cs
index f77f0bc5..76164d26 100644
--- a/src/Merge.Client/Filestorage/Groups/Requests/GroupsRetrieveRequest.cs
+++ b/src/Merge.Client/Filestorage/Groups/Requests/GroupsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Filestorage;
 
-public class GroupsRetrieveRequest
+public record GroupsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Issues/IssuesClient.cs b/src/Merge.Client/Filestorage/Issues/IssuesClient.cs
index 21eabe47..21ca912e 100644
--- a/src/Merge.Client/Filestorage/Issues/IssuesClient.cs
+++ b/src/Merge.Client/Filestorage/Issues/IssuesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public IssuesClient(RawClient client)
     /// <summary>
     /// Gets all issues for Organization.
     /// </summary>
-    public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
+    public async Task<PaginatedIssueList> ListAsync(
+        IssuesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountToken != null)
@@ -40,13 +43,13 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         if (request.FirstIncidentTimeAfter != null)
         {
             _query["first_incident_time_after"] = request.FirstIncidentTimeAfter.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.FirstIncidentTimeBefore != null)
         {
             _query["first_incident_time_before"] = request.FirstIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.IncludeMuted != null)
@@ -59,12 +62,14 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         }
         if (request.LastIncidentTimeAfter != null)
         {
-            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString("o0");
+            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.LastIncidentTimeBefore != null)
         {
             _query["last_incident_time_before"] = request.LastIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.LinkedAccountId != null)
@@ -86,36 +91,64 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/issues",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedIssueList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedIssueList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get a specific issue.
     /// </summary>
-    public async Task<Issue> RetrieveAsync(string id)
+    public async Task<Issue> RetrieveAsync(string id, RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"filestorage/v1/issues/{id}"
+                Path = $"filestorage/v1/issues/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Issue>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Issue>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/Issues/Requests/IssuesListRequest.cs b/src/Merge.Client/Filestorage/Issues/Requests/IssuesListRequest.cs
index af98361d..f5006e62 100644
--- a/src/Merge.Client/Filestorage/Issues/Requests/IssuesListRequest.cs
+++ b/src/Merge.Client/Filestorage/Issues/Requests/IssuesListRequest.cs
@@ -1,66 +1,62 @@
-using Merge.Client.Filestorage;
-
-#nullable enable
-
 namespace Merge.Client.Filestorage;
 
-public class IssuesListRequest
+public record IssuesListRequest
 {
-    public string? AccountToken { get; init; }
+    public string? AccountToken { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was after this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeAfter { get; init; }
+    public DateTime? FirstIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was before this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeBefore { get; init; }
+    public DateTime? FirstIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If true, will include muted issues
     /// </summary>
-    public string? IncludeMuted { get; init; }
+    public string? IncludeMuted { get; set; }
 
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was after this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeAfter { get; init; }
+    public DateTime? LastIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was before this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeBefore { get; init; }
+    public DateTime? LastIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If provided, will only include issues pertaining to the linked account passed in.
     /// </summary>
-    public string? LinkedAccountId { get; init; }
+    public string? LinkedAccountId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -68,5 +64,5 @@ public class IssuesListRequest
     /// - `ONGOING` - ONGOING
     /// - `RESOLVED` - RESOLVED
     /// </summary>
-    public IssuesListRequestStatus? Status { get; init; }
+    public IssuesListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Issues/Types/IssuesListRequestStatus.cs b/src/Merge.Client/Filestorage/Issues/Types/IssuesListRequestStatus.cs
index 2f21c673..9dee1009 100644
--- a/src/Merge.Client/Filestorage/Issues/Types/IssuesListRequestStatus.cs
+++ b/src/Merge.Client/Filestorage/Issues/Types/IssuesListRequestStatus.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/LinkToken/LinkTokenClient.cs b/src/Merge.Client/Filestorage/LinkToken/LinkTokenClient.cs
index 9cdb75ab..38907e7e 100644
--- a/src/Merge.Client/Filestorage/LinkToken/LinkTokenClient.cs
+++ b/src/Merge.Client/Filestorage/LinkToken/LinkTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public LinkTokenClient(RawClient client)
     /// <summary>
     /// Creates a link token to be used when linking a new end user.
     /// </summary>
-    public async Task<LinkToken> CreateAsync(EndUserDetailsRequest request)
+    public async Task<LinkToken> CreateAsync(
+        EndUserDetailsRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/link-token",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<LinkToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<LinkToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/LinkToken/Requests/EndUserDetailsRequest.cs b/src/Merge.Client/Filestorage/LinkToken/Requests/EndUserDetailsRequest.cs
index cd7130d4..292a6a34 100644
--- a/src/Merge.Client/Filestorage/LinkToken/Requests/EndUserDetailsRequest.cs
+++ b/src/Merge.Client/Filestorage/LinkToken/Requests/EndUserDetailsRequest.cs
@@ -1,65 +1,64 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class EndUserDetailsRequest
+public record EndUserDetailsRequest
 {
     /// <summary>
     /// Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.
     /// </summary>
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// Your end user's organization.
     /// </summary>
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.
     /// </summary>
     [JsonPropertyName("end_user_origin_id")]
-    public string EndUserOriginId { get; init; }
+    public required string EndUserOriginId { get; set; }
 
     /// <summary>
     /// The integration categories to show in Merge Link.
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     /// <summary>
     /// The slug of a specific pre-selected integration for this linking flow token. For examples of slugs, see https://docs.merge.dev/guides/merge-link/single-integration/.
     /// </summary>
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     /// <summary>
     /// An integer number of minutes between [30, 720 or 10080 if for a Magic Link URL] for how long this token is valid. Defaults to 30.
     /// </summary>
     [JsonPropertyName("link_expiry_mins")]
-    public int? LinkExpiryMins { get; init; }
+    public int? LinkExpiryMins { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("should_create_magic_link_url")]
-    public bool? ShouldCreateMagicLinkUrl { get; init; }
+    public bool? ShouldCreateMagicLinkUrl { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL on the Admin Needed screen during the linking flow. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("hide_admin_magic_link")]
-    public bool? HideAdminMagicLink { get; init; }
+    public bool? HideAdminMagicLink { get; set; }
 
     /// <summary>
     /// An array of objects to specify the models and fields that will be disabled for a given Linked Account. Each object uses model_id, enabled_actions, and disabled_fields to specify the model, method, and fields that are scoped for a given Linked Account.
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; init; }
+    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; set; }
 
     /// <summary>
     /// When creating a Link Token, you can set permissions for Common Models that will apply to the account that is going to be linked. Any model or field not specified in link token payload will default to existing settings.
@@ -68,17 +67,17 @@ public class EndUserDetailsRequest
     public Dictionary<
         string,
         IEnumerable<IndividualCommonModelScopeDeserializerRequest>?
-    >? CategoryCommonModelScopes { get; init; }
+    >? CategoryCommonModelScopes { get; set; }
 
     /// <summary>
     /// The language code for the language to localize Merge Link to.
     /// </summary>
     [JsonPropertyName("language")]
-    public string? Language { get; init; }
+    public string? Language { get; set; }
 
     /// <summary>
     /// A JSON object containing integration-specific configuration options.
     /// </summary>
     [JsonPropertyName("integration_specific_config")]
-    public Dictionary<string, object>? IntegrationSpecificConfig { get; init; }
+    public Dictionary<string, object?>? IntegrationSpecificConfig { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/LinkedAccounts/LinkedAccountsClient.cs b/src/Merge.Client/Filestorage/LinkedAccounts/LinkedAccountsClient.cs
index ce6ae079..986d6332 100644
--- a/src/Merge.Client/Filestorage/LinkedAccounts/LinkedAccountsClient.cs
+++ b/src/Merge.Client/Filestorage/LinkedAccounts/LinkedAccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,7 +19,8 @@ public LinkedAccountsClient(RawClient client)
     /// List linked accounts for your organization.
     /// </summary>
     public async Task<PaginatedAccountDetailsAndActionsList> ListAsync(
-        LinkedAccountsListRequest request
+        LinkedAccountsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -78,16 +79,30 @@ LinkedAccountsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/linked-accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/LinkedAccounts/Requests/LinkedAccountsListRequest.cs b/src/Merge.Client/Filestorage/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
index 9d2743f2..19582a75 100644
--- a/src/Merge.Client/Filestorage/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
+++ b/src/Merge.Client/Filestorage/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
@@ -1,10 +1,6 @@
-using Merge.Client.Filestorage;
-
-#nullable enable
-
 namespace Merge.Client.Filestorage;
 
-public class LinkedAccountsListRequest
+public record LinkedAccountsListRequest
 {
     /// <summary>
     /// Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
@@ -17,62 +13,62 @@ public class LinkedAccountsListRequest
     /// - `mktg` - mktg
     /// - `filestorage` - filestorage
     /// </summary>
-    public LinkedAccountsListRequestCategory? Category { get; init; }
+    public LinkedAccountsListRequestCategory? Category { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given email address.
     /// </summary>
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given organization name.
     /// </summary>
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given origin ID.
     /// </summary>
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     /// <summary>
     /// Comma-separated list of EndUser origin IDs, making it possible to specify multiple EndUsers at once.
     /// </summary>
-    public string? EndUserOriginIds { get; init; }
+    public string? EndUserOriginIds { get; set; }
 
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Comma-separated list of LinkedAccount IDs, making it possible to specify multiple LinkedAccounts at once.
     /// </summary>
-    public string? Ids { get; init; }
+    public string? Ids { get; set; }
 
     /// <summary>
     /// If `true`, will include complete production duplicates of the account specified by the `id` query parameter in the response. `id` must be for a complete production linked account.
     /// </summary>
-    public bool? IncludeDuplicates { get; init; }
+    public bool? IncludeDuplicates { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given integration name.
     /// </summary>
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If included, will only include test linked accounts. If not included, will only include non-test linked accounts.
     /// </summary>
-    public string? IsTestAccount { get; init; }
+    public string? IsTestAccount { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Filter by status. Options: `COMPLETE`, `INCOMPLETE`, `RELINK_NEEDED`
     /// </summary>
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs b/src/Merge.Client/Filestorage/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
index fb0340f2..a17fcaa0 100644
--- a/src/Merge.Client/Filestorage/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
+++ b/src/Merge.Client/Filestorage/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Passthrough/PassthroughClient.cs b/src/Merge.Client/Filestorage/Passthrough/PassthroughClient.cs
index 070bb084..a9686660 100644
--- a/src/Merge.Client/Filestorage/Passthrough/PassthroughClient.cs
+++ b/src/Merge.Client/Filestorage/Passthrough/PassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public PassthroughClient(RawClient client)
     /// <summary>
     /// Pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<RemoteResponse> CreateAsync(DataPassthroughRequest request)
+    public async Task<RemoteResponse> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/RegenerateKey/RegenerateKeyClient.cs b/src/Merge.Client/Filestorage/RegenerateKey/RegenerateKeyClient.cs
index 0dd676c8..6ea7d6bc 100644
--- a/src/Merge.Client/Filestorage/RegenerateKey/RegenerateKeyClient.cs
+++ b/src/Merge.Client/Filestorage/RegenerateKey/RegenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public RegenerateKeyClient(RawClient client)
     /// <summary>
     /// Exchange remote keys.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(RemoteKeyForRegenerationRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        RemoteKeyForRegenerationRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/regenerate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs b/src/Merge.Client/Filestorage/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
index 837f40b0..dcf57b69 100644
--- a/src/Merge.Client/Filestorage/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
+++ b/src/Merge.Client/Filestorage/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Filestorage;
 
-public class RemoteKeyForRegenerationRequest
+public record RemoteKeyForRegenerationRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Filestorage/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
index 07eb735c..a728ce6e 100644
--- a/src/Merge.Client/Filestorage/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Filestorage/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class LinkedAccountCommonModelScopeDeserializerRequest
+public record LinkedAccountCommonModelScopeDeserializerRequest
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializerRequest>();
 }
diff --git a/src/Merge.Client/Filestorage/Scopes/ScopesClient.cs b/src/Merge.Client/Filestorage/Scopes/ScopesClient.cs
index eed25071..a69c5030 100644
--- a/src/Merge.Client/Filestorage/Scopes/ScopesClient.cs
+++ b/src/Merge.Client/Filestorage/Scopes/ScopesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,63 +18,110 @@ public ScopesClient(RawClient client)
     /// <summary>
     /// Get the default permissions for Merge Common Models and fields across all Linked Accounts of a given category. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/default-scopes"
+                Path = "filestorage/v1/default-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all available permissions for Merge Common Models and fields for a single Linked Account. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/linked-account-scopes"
+                Path = "filestorage/v1/linked-account-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Update permissions for any Common Model or field for a single Linked Account. Any Scopes not set in this POST request will inherit the default Scopes. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes)
     /// </summary>
     public async Task<CommonModelScopeApi> LinkedAccountScopesCreateAsync(
-        LinkedAccountCommonModelScopeDeserializerRequest request
+        LinkedAccountCommonModelScopeDeserializerRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/linked-account-scopes",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/SyncStatus/Requests/SyncStatusListRequest.cs b/src/Merge.Client/Filestorage/SyncStatus/Requests/SyncStatusListRequest.cs
index 6732f6a8..c95ea4e1 100644
--- a/src/Merge.Client/Filestorage/SyncStatus/Requests/SyncStatusListRequest.cs
+++ b/src/Merge.Client/Filestorage/SyncStatus/Requests/SyncStatusListRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Filestorage;
 
-public class SyncStatusListRequest
+public record SyncStatusListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/SyncStatus/SyncStatusClient.cs b/src/Merge.Client/Filestorage/SyncStatus/SyncStatusClient.cs
index 99a10592..c5c55768 100644
--- a/src/Merge.Client/Filestorage/SyncStatus/SyncStatusClient.cs
+++ b/src/Merge.Client/Filestorage/SyncStatus/SyncStatusClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public SyncStatusClient(RawClient client)
     /// <summary>
     /// Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `PARTIALLY_SYNCED`, `PAUSED`, `SYNCING`. Learn more about sync status in our [Help Center](https://help.merge.dev/en/articles/8184193-merge-sync-statuses).
     /// </summary>
-    public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest request)
+    public async Task<PaginatedSyncStatusList> ListAsync(
+        SyncStatusListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -32,16 +35,30 @@ public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest reque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/sync-status",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedSyncStatusList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedSyncStatusList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AccountDetails.cs b/src/Merge.Client/Filestorage/Types/AccountDetails.cs
index 954bc77b..4c55348a 100644
--- a/src/Merge.Client/Filestorage/Types/AccountDetails.cs
+++ b/src/Merge.Client/Filestorage/Types/AccountDetails.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class AccountDetails
+public record AccountDetails
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     [JsonPropertyName("integration_slug")]
-    public string? IntegrationSlug { get; init; }
+    public string? IntegrationSlug { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     [JsonPropertyName("status")]
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string? WebhookListenerUrl { get; init; }
+    public string? WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string? AccountType { get; init; }
+    public string? AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AccountDetailsAndActions.cs b/src/Merge.Client/Filestorage/Types/AccountDetailsAndActions.cs
index 0140275e..901a72b2 100644
--- a/src/Merge.Client/Filestorage/Types/AccountDetailsAndActions.cs
+++ b/src/Merge.Client/Filestorage/Types/AccountDetailsAndActions.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class AccountDetailsAndActions
+public record AccountDetailsAndActions
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("status")]
-    public AccountDetailsAndActionsStatusEnum Status { get; init; }
+    public required AccountDetailsAndActionsStatusEnum Status { get; set; }
 
     [JsonPropertyName("status_detail")]
-    public string? StatusDetail { get; init; }
+    public string? StatusDetail { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// The tenant or domain the customer has provided access to.
     /// </summary>
     [JsonPropertyName("subdomain")]
-    public string? Subdomain { get; init; }
+    public string? Subdomain { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string WebhookListenerUrl { get; init; }
+    public required string WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountDetailsAndActionsIntegration? Integration { get; init; }
+    public AccountDetailsAndActionsIntegration? Integration { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string AccountType { get; init; }
+    public required string AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AccountDetailsAndActionsIntegration.cs b/src/Merge.Client/Filestorage/Types/AccountDetailsAndActionsIntegration.cs
index 005277a2..3f7dc9f7 100644
--- a/src/Merge.Client/Filestorage/Types/AccountDetailsAndActionsIntegration.cs
+++ b/src/Merge.Client/Filestorage/Types/AccountDetailsAndActionsIntegration.cs
@@ -1,33 +1,32 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class AccountDetailsAndActionsIntegration
+public record AccountDetailsAndActionsIntegration
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     [JsonPropertyName("color")]
-    public string Color { get; init; }
+    public required string Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string Slug { get; init; }
+    public required string Slug { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AccountDetailsAndActionsStatusEnum.cs b/src/Merge.Client/Filestorage/Types/AccountDetailsAndActionsStatusEnum.cs
index 92de266e..5bcabf05 100644
--- a/src/Merge.Client/Filestorage/Types/AccountDetailsAndActionsStatusEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/AccountDetailsAndActionsStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/AccountIntegration.cs b/src/Merge.Client/Filestorage/Types/AccountIntegration.cs
index b32a2004..1ebb2e48 100644
--- a/src/Merge.Client/Filestorage/Types/AccountIntegration.cs
+++ b/src/Merge.Client/Filestorage/Types/AccountIntegration.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class AccountIntegration
+public record AccountIntegration
 {
     /// <summary>
     /// Company name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// Optional. This shortened name appears in places with limited space, usually in conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example: <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP SuccessFactors)</i>
     /// </summary>
     [JsonPropertyName("abbreviated_name")]
-    public string? AbbreviatedName { get; init; }
+    public string? AbbreviatedName { get; set; }
 
     /// <summary>
     /// Category or categories this integration belongs to. Multiple categories should be comma separated, i.e. [ats, hris].
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum>? Categories { get; init; }
+    public IEnumerable<CategoriesEnum>? Categories { get; set; }
 
     /// <summary>
     /// Company logo in rectangular shape. <b>Upload an image with a clear background.</b>
     /// </summary>
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     /// <summary>
     /// Company logo in square shape. <b>Upload an image with a white background.</b>
     /// </summary>
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     /// <summary>
     /// The color of this integration used for buttons and text throughout the app and landing pages. <b>Choose a darker, saturated color.</b>
     /// </summary>
     [JsonPropertyName("color")]
-    public string? Color { get; init; }
+    public string? Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string? Slug { get; init; }
+    public string? Slug { get; set; }
 
     /// <summary>
     /// Mapping of API endpoints to documentation urls for support. Example: {'GET': [['/common-model-scopes', 'https://docs.merge.dev/accounting/common-model-scopes/#common_model_scopes_retrieve'],['/common-model-actions', 'https://docs.merge.dev/accounting/common-model-actions/#common_model_actions_retrieve']], 'POST': []}
     /// </summary>
     [JsonPropertyName("api_endpoints_to_documentation_urls")]
-    public Dictionary<string, object>? ApiEndpointsToDocumentationUrls { get; init; }
+    public Dictionary<string, object?>? ApiEndpointsToDocumentationUrls { get; set; }
 
     /// <summary>
     /// Setup guide URL for third party webhook creation. Exposed in Merge Docs.
     /// </summary>
     [JsonPropertyName("webhook_setup_guide_url")]
-    public string? WebhookSetupGuideUrl { get; init; }
+    public string? WebhookSetupGuideUrl { get; set; }
 
     /// <summary>
     /// Category or categories this integration is in beta status for.
     /// </summary>
     [JsonPropertyName("category_beta_status")]
-    public Dictionary<string, object>? CategoryBetaStatus { get; init; }
+    public Dictionary<string, object?>? CategoryBetaStatus { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AccountToken.cs b/src/Merge.Client/Filestorage/Types/AccountToken.cs
index ebae9996..80cd646c 100644
--- a/src/Merge.Client/Filestorage/Types/AccountToken.cs
+++ b/src/Merge.Client/Filestorage/Types/AccountToken.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class AccountToken
+public record AccountToken
 {
     [JsonPropertyName("account_token")]
-    public string AccountToken_ { get; init; }
+    public required string AccountToken_ { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AdvancedMetadata.cs b/src/Merge.Client/Filestorage/Types/AdvancedMetadata.cs
index 110611d0..43bd5408 100644
--- a/src/Merge.Client/Filestorage/Types/AdvancedMetadata.cs
+++ b/src/Merge.Client/Filestorage/Types/AdvancedMetadata.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Filestorage;
 
-public class AdvancedMetadata
+public record AdvancedMetadata
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("is_custom")]
-    public bool? IsCustom { get; init; }
+    public bool? IsCustom { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<object>? FieldChoices { get; init; }
+    public IEnumerable<object>? FieldChoices { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AsyncPassthroughReciept.cs b/src/Merge.Client/Filestorage/Types/AsyncPassthroughReciept.cs
index 8a162bdc..556c50f7 100644
--- a/src/Merge.Client/Filestorage/Types/AsyncPassthroughReciept.cs
+++ b/src/Merge.Client/Filestorage/Types/AsyncPassthroughReciept.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Filestorage;
 
-public class AsyncPassthroughReciept
+public record AsyncPassthroughReciept
 {
     [JsonPropertyName("async_passthrough_receipt_id")]
-    public string AsyncPassthroughReceiptId { get; init; }
+    public required string AsyncPassthroughReceiptId { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AuditLogEvent.cs b/src/Merge.Client/Filestorage/Types/AuditLogEvent.cs
index 372bda69..14094d88 100644
--- a/src/Merge.Client/Filestorage/Types/AuditLogEvent.cs
+++ b/src/Merge.Client/Filestorage/Types/AuditLogEvent.cs
@@ -1,26 +1,25 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class AuditLogEvent
+public record AuditLogEvent
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The User's full name at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_name")]
-    public string? UserName { get; init; }
+    public string? UserName { get; set; }
 
     /// <summary>
     /// The User's email at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_email")]
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 
     /// <summary>
     /// Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.
@@ -33,10 +32,10 @@ public class AuditLogEvent
     /// - `MERGE_TEAM` - MERGE_TEAM
     /// </summary>
     [JsonPropertyName("role")]
-    public RoleEnum Role { get; init; }
+    public required RoleEnum Role { get; set; }
 
     [JsonPropertyName("ip_address")]
-    public string IpAddress { get; init; }
+    public required string IpAddress { get; set; }
 
     /// <summary>
     /// Designates the type of event that occurred.
@@ -81,11 +80,11 @@ public class AuditLogEvent
     /// - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
     /// </summary>
     [JsonPropertyName("event_type")]
-    public EventTypeEnum EventType { get; init; }
+    public required EventTypeEnum EventType { get; set; }
 
     [JsonPropertyName("event_description")]
-    public string EventDescription { get; init; }
+    public required string EventDescription { get; set; }
 
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/AvailableActions.cs b/src/Merge.Client/Filestorage/Types/AvailableActions.cs
index a8b570b9..e4e91dfa 100644
--- a/src/Merge.Client/Filestorage/Types/AvailableActions.cs
+++ b/src/Merge.Client/Filestorage/Types/AvailableActions.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class AvailableActions
+public record AvailableActions
 {
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/CategoriesEnum.cs b/src/Merge.Client/Filestorage/Types/CategoriesEnum.cs
index 97d15d1f..b26eb3c8 100644
--- a/src/Merge.Client/Filestorage/Types/CategoriesEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/CategoriesEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/CategoryEnum.cs b/src/Merge.Client/Filestorage/Types/CategoryEnum.cs
index 8dc31360..ffe0e6b2 100644
--- a/src/Merge.Client/Filestorage/Types/CategoryEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/CategoryEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/CommonModelScopeApi.cs b/src/Merge.Client/Filestorage/Types/CommonModelScopeApi.cs
index e3708308..a19127fe 100644
--- a/src/Merge.Client/Filestorage/Types/CommonModelScopeApi.cs
+++ b/src/Merge.Client/Filestorage/Types/CommonModelScopeApi.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class CommonModelScopeApi
+public record CommonModelScopeApi
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializer>();
 }
diff --git a/src/Merge.Client/Filestorage/Types/CommonModelScopesBodyRequest.cs b/src/Merge.Client/Filestorage/Types/CommonModelScopesBodyRequest.cs
index 5d8d93ba..177ab621 100644
--- a/src/Merge.Client/Filestorage/Types/CommonModelScopesBodyRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/CommonModelScopesBodyRequest.cs
@@ -1,18 +1,18 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class CommonModelScopesBodyRequest
+public record CommonModelScopesBodyRequest
 {
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("enabled_actions")]
-    public IEnumerable<EnabledActionsEnum> EnabledActions { get; init; }
+    public IEnumerable<EnabledActionsEnum> EnabledActions { get; set; } =
+        new List<EnabledActionsEnum>();
 
     [JsonPropertyName("disabled_fields")]
-    public IEnumerable<string> DisabledFields { get; init; }
+    public IEnumerable<string> DisabledFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Filestorage/Types/DataPassthroughRequest.cs b/src/Merge.Client/Filestorage/Types/DataPassthroughRequest.cs
index e9bfd5bf..53a04401 100644
--- a/src/Merge.Client/Filestorage/Types/DataPassthroughRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/DataPassthroughRequest.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class DataPassthroughRequest
+public record DataPassthroughRequest
 {
     [JsonPropertyName("method")]
-    public MethodEnum Method { get; init; }
+    public required MethodEnum Method { get; set; }
 
     /// <summary>
     /// The path of the request in the third party's platform.
     /// </summary>
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     /// <summary>
     /// An optional override of the third party's base url for the request.
     /// </summary>
     [JsonPropertyName("base_url_override")]
-    public string? BaseUrlOverride { get; init; }
+    public string? BaseUrlOverride { get; set; }
 
     /// <summary>
     /// The data with the request. You must include a `request_format` parameter matching the data's format
     /// </summary>
     [JsonPropertyName("data")]
-    public string? Data { get; init; }
+    public string? Data { get; set; }
 
     /// <summary>
     /// Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`.
     /// </summary>
     [JsonPropertyName("multipart_form_data")]
-    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; init; }
+    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; set; }
 
     /// <summary>
     /// The headers to use for the request (Merge will handle the account's authorization headers). `Content-Type` header is required for passthrough. Choose content type corresponding to expected format of receiving server.
     /// </summary>
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 
     [JsonPropertyName("request_format")]
-    public RequestFormatEnum? RequestFormat { get; init; }
+    public RequestFormatEnum? RequestFormat { get; set; }
 
     /// <summary>
     /// Optional. If true, the response will always be an object of the form `{"type": T, "value": ...}` where `T` will be one of `string, boolean, number, null, array, object`.
     /// </summary>
     [JsonPropertyName("normalize_response")]
-    public bool? NormalizeResponse { get; init; }
+    public bool? NormalizeResponse { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/DebugModeLog.cs b/src/Merge.Client/Filestorage/Types/DebugModeLog.cs
index 7774e66b..21a15750 100644
--- a/src/Merge.Client/Filestorage/Types/DebugModeLog.cs
+++ b/src/Merge.Client/Filestorage/Types/DebugModeLog.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class DebugModeLog
+public record DebugModeLog
 {
     [JsonPropertyName("log_id")]
-    public string LogId { get; init; }
+    public required string LogId { get; set; }
 
     [JsonPropertyName("dashboard_view")]
-    public string DashboardView { get; init; }
+    public required string DashboardView { get; set; }
 
     [JsonPropertyName("log_summary")]
-    public DebugModelLogSummary LogSummary { get; init; }
+    public required DebugModelLogSummary LogSummary { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/DebugModelLogSummary.cs b/src/Merge.Client/Filestorage/Types/DebugModelLogSummary.cs
index 97937c04..85188fe9 100644
--- a/src/Merge.Client/Filestorage/Types/DebugModelLogSummary.cs
+++ b/src/Merge.Client/Filestorage/Types/DebugModelLogSummary.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Filestorage;
 
-public class DebugModelLogSummary
+public record DebugModelLogSummary
 {
     [JsonPropertyName("url")]
-    public string Url { get; init; }
+    public required string Url { get; set; }
 
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("status_code")]
-    public int StatusCode { get; init; }
+    public required int StatusCode { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/Drive.cs b/src/Merge.Client/Filestorage/Types/Drive.cs
index cf566ca0..12c32ab0 100644
--- a/src/Merge.Client/Filestorage/Types/Drive.cs
+++ b/src/Merge.Client/Filestorage/Types/Drive.cs
@@ -4,56 +4,56 @@
 
 namespace Merge.Client.Filestorage;
 
-public class Drive
+public record Drive
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The drive's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// When the third party's drive was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// The drive's url.
     /// </summary>
     [JsonPropertyName("drive_url")]
-    public string? DriveUrl { get; init; }
+    public string? DriveUrl { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<Dictionary<string, object>>? RemoteData { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/EnabledActionsEnum.cs b/src/Merge.Client/Filestorage/Types/EnabledActionsEnum.cs
index 0df1d77d..01613d6e 100644
--- a/src/Merge.Client/Filestorage/Types/EnabledActionsEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/EnabledActionsEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/EncodingEnum.cs b/src/Merge.Client/Filestorage/Types/EncodingEnum.cs
index 90bbf36a..dc9372b7 100644
--- a/src/Merge.Client/Filestorage/Types/EncodingEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/EncodingEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/ErrorValidationProblem.cs b/src/Merge.Client/Filestorage/Types/ErrorValidationProblem.cs
index 4cea9da1..579501c6 100644
--- a/src/Merge.Client/Filestorage/Types/ErrorValidationProblem.cs
+++ b/src/Merge.Client/Filestorage/Types/ErrorValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class ErrorValidationProblem
+public record ErrorValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/EventTypeEnum.cs b/src/Merge.Client/Filestorage/Types/EventTypeEnum.cs
index e6e22483..fd9ebfe9 100644
--- a/src/Merge.Client/Filestorage/Types/EventTypeEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/EventTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/ExternalTargetFieldApi.cs b/src/Merge.Client/Filestorage/Types/ExternalTargetFieldApi.cs
index 5bb18206..60f23090 100644
--- a/src/Merge.Client/Filestorage/Types/ExternalTargetFieldApi.cs
+++ b/src/Merge.Client/Filestorage/Types/ExternalTargetFieldApi.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Filestorage;
 
-public class ExternalTargetFieldApi
+public record ExternalTargetFieldApi
 {
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_mapped")]
-    public string? IsMapped { get; init; }
+    public string? IsMapped { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/ExternalTargetFieldApiResponse.cs b/src/Merge.Client/Filestorage/Types/ExternalTargetFieldApiResponse.cs
index ee51b7d4..5cf13c8a 100644
--- a/src/Merge.Client/Filestorage/Types/ExternalTargetFieldApiResponse.cs
+++ b/src/Merge.Client/Filestorage/Types/ExternalTargetFieldApiResponse.cs
@@ -1,24 +1,23 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class ExternalTargetFieldApiResponse
+public record ExternalTargetFieldApiResponse
 {
     [JsonPropertyName("File")]
-    public IEnumerable<ExternalTargetFieldApi>? File { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? File { get; set; }
 
     [JsonPropertyName("Folder")]
-    public IEnumerable<ExternalTargetFieldApi>? Folder { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Folder { get; set; }
 
     [JsonPropertyName("Drive")]
-    public IEnumerable<ExternalTargetFieldApi>? Drive { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Drive { get; set; }
 
     [JsonPropertyName("Group")]
-    public IEnumerable<ExternalTargetFieldApi>? Group { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Group { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<ExternalTargetFieldApi>? User { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? User { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstance.cs b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstance.cs
index 7cce120f..c2b4b82a 100644
--- a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstance.cs
+++ b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstance.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class FieldMappingApiInstance
+public record FieldMappingApiInstance
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("is_integration_wide")]
-    public bool? IsIntegrationWide { get; init; }
+    public bool? IsIntegrationWide { get; set; }
 
     [JsonPropertyName("target_field")]
-    public FieldMappingApiInstanceTargetField? TargetField { get; init; }
+    public FieldMappingApiInstanceTargetField? TargetField { get; set; }
 
     [JsonPropertyName("remote_field")]
-    public FieldMappingApiInstanceRemoteField? RemoteField { get; init; }
+    public FieldMappingApiInstanceRemoteField? RemoteField { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceRemoteField.cs b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceRemoteField.cs
index 911a1be9..d80c4b6f 100644
--- a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceRemoteField.cs
+++ b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceRemoteField.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class FieldMappingApiInstanceRemoteField
+public record FieldMappingApiInstanceRemoteField
 {
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_endpoint_info")]
-    public FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
index 944670fd..bd583d22 100644
--- a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
+++ b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Filestorage;
 
-public class FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
+public record FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string? Method { get; init; }
+    public string? Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string? UrlPath { get; init; }
+    public string? UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<string>? FieldTraversalPath { get; init; }
+    public IEnumerable<string>? FieldTraversalPath { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceResponse.cs b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceResponse.cs
index fb9378e5..f9d0f548 100644
--- a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceResponse.cs
+++ b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceResponse.cs
@@ -1,24 +1,23 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class FieldMappingApiInstanceResponse
+public record FieldMappingApiInstanceResponse
 {
     [JsonPropertyName("File")]
-    public IEnumerable<FieldMappingApiInstance>? File { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? File { get; set; }
 
     [JsonPropertyName("Folder")]
-    public IEnumerable<FieldMappingApiInstance>? Folder { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Folder { get; set; }
 
     [JsonPropertyName("Drive")]
-    public IEnumerable<FieldMappingApiInstance>? Drive { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Drive { get; set; }
 
     [JsonPropertyName("Group")]
-    public IEnumerable<FieldMappingApiInstance>? Group { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Group { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<FieldMappingApiInstance>? User { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? User { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceTargetField.cs b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceTargetField.cs
index 9997eb99..b74c9b7b 100644
--- a/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceTargetField.cs
+++ b/src/Merge.Client/Filestorage/Types/FieldMappingApiInstanceTargetField.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Filestorage;
 
-public class FieldMappingApiInstanceTargetField
+public record FieldMappingApiInstanceTargetField
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string Description { get; init; }
+    public required string Description { get; set; }
 
     [JsonPropertyName("is_organization_wide")]
-    public bool IsOrganizationWide { get; init; }
+    public required bool IsOrganizationWide { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FieldMappingInstanceResponse.cs b/src/Merge.Client/Filestorage/Types/FieldMappingInstanceResponse.cs
index 29b70853..0e6bdfe1 100644
--- a/src/Merge.Client/Filestorage/Types/FieldMappingInstanceResponse.cs
+++ b/src/Merge.Client/Filestorage/Types/FieldMappingInstanceResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class FieldMappingInstanceResponse
+public record FieldMappingInstanceResponse
 {
     [JsonPropertyName("model")]
-    public FieldMappingApiInstance Model { get; init; }
+    public required FieldMappingApiInstance Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FieldPermissionDeserializer.cs b/src/Merge.Client/Filestorage/Types/FieldPermissionDeserializer.cs
index 189ea94d..bd72efdb 100644
--- a/src/Merge.Client/Filestorage/Types/FieldPermissionDeserializer.cs
+++ b/src/Merge.Client/Filestorage/Types/FieldPermissionDeserializer.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Filestorage;
 
-public class FieldPermissionDeserializer
+public record FieldPermissionDeserializer
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FieldPermissionDeserializerRequest.cs b/src/Merge.Client/Filestorage/Types/FieldPermissionDeserializerRequest.cs
index 9c3380b3..8e497a69 100644
--- a/src/Merge.Client/Filestorage/Types/FieldPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/FieldPermissionDeserializerRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Filestorage;
 
-public class FieldPermissionDeserializerRequest
+public record FieldPermissionDeserializerRequest
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/File.cs b/src/Merge.Client/Filestorage/Types/File.cs
index 9fdb9bf6..76592904 100644
--- a/src/Merge.Client/Filestorage/Types/File.cs
+++ b/src/Merge.Client/Filestorage/Types/File.cs
@@ -1,77 +1,76 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class File
+public record File
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The file's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The URL to access the file.
     /// </summary>
     [JsonPropertyName("file_url")]
-    public string? FileUrl { get; init; }
+    public string? FileUrl { get; set; }
 
     /// <summary>
     /// The URL that produces a thumbnail preview of the file. Typically an image.
     /// </summary>
     [JsonPropertyName("file_thumbnail_url")]
-    public string? FileThumbnailUrl { get; init; }
+    public string? FileThumbnailUrl { get; set; }
 
     /// <summary>
     /// The file's size, in bytes.
     /// </summary>
     [JsonPropertyName("size")]
-    public int? Size { get; init; }
+    public long? Size { get; set; }
 
     /// <summary>
     /// The file's mime type.
     /// </summary>
     [JsonPropertyName("mime_type")]
-    public string? MimeType { get; init; }
+    public string? MimeType { get; set; }
 
     /// <summary>
     /// The file's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The folder that the file belongs to.
     /// </summary>
     [JsonPropertyName("folder")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Folder>>))]
-    public OneOf<string, Folder>? Folder { get; init; }
+    public OneOf<string, Folder>? Folder { get; set; }
 
     /// <summary>
     /// The Permission object is used to represent a user's or group's access to a File or Folder. Permissions are unexpanded by default. Use the query param `expand=permissions` to see more details under `GET /files`.
@@ -86,36 +85,36 @@ public OneOf<
         string,
         PermissionRequest,
         IEnumerable<OneOf<string, PermissionRequest>>
-    >? Permissions { get; init; }
+    >? Permissions { get; set; }
 
     /// <summary>
     /// The drive that the file belongs to.
     /// </summary>
     [JsonPropertyName("drive")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Drive>>))]
-    public OneOf<string, Drive>? Drive { get; init; }
+    public OneOf<string, Drive>? Drive { get; set; }
 
     /// <summary>
     /// When the third party's file was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's file was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<Dictionary<string, object>>? RemoteData { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FileRequest.cs b/src/Merge.Client/Filestorage/Types/FileRequest.cs
index 7bf02efd..28157dd9 100644
--- a/src/Merge.Client/Filestorage/Types/FileRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/FileRequest.cs
@@ -1,56 +1,55 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class FileRequest
+public record FileRequest
 {
     /// <summary>
     /// The file's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The URL to access the file.
     /// </summary>
     [JsonPropertyName("file_url")]
-    public string? FileUrl { get; init; }
+    public string? FileUrl { get; set; }
 
     /// <summary>
     /// The URL that produces a thumbnail preview of the file. Typically an image.
     /// </summary>
     [JsonPropertyName("file_thumbnail_url")]
-    public string? FileThumbnailUrl { get; init; }
+    public string? FileThumbnailUrl { get; set; }
 
     /// <summary>
     /// The file's size, in bytes.
     /// </summary>
     [JsonPropertyName("size")]
-    public int? Size { get; init; }
+    public long? Size { get; set; }
 
     /// <summary>
     /// The file's mime type.
     /// </summary>
     [JsonPropertyName("mime_type")]
-    public string? MimeType { get; init; }
+    public string? MimeType { get; set; }
 
     /// <summary>
     /// The file's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The folder that the file belongs to.
     /// </summary>
     [JsonPropertyName("folder")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Folder>>))]
-    public OneOf<string, Folder>? Folder { get; init; }
+    public OneOf<string, Folder>? Folder { get; set; }
 
     /// <summary>
     /// The Permission object is used to represent a user's or group's access to a File or Folder. Permissions are unexpanded by default. Use the query param `expand=permissions` to see more details under `GET /files`.
@@ -65,18 +64,18 @@ public OneOf<
         string,
         PermissionRequest,
         IEnumerable<OneOf<string, PermissionRequest>>
-    >? Permissions { get; init; }
+    >? Permissions { get; set; }
 
     /// <summary>
     /// The drive that the file belongs to.
     /// </summary>
     [JsonPropertyName("drive")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Drive>>))]
-    public OneOf<string, Drive>? Drive { get; init; }
+    public OneOf<string, Drive>? Drive { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FileStorageFileResponse.cs b/src/Merge.Client/Filestorage/Types/FileStorageFileResponse.cs
index a05543f7..44e76a88 100644
--- a/src/Merge.Client/Filestorage/Types/FileStorageFileResponse.cs
+++ b/src/Merge.Client/Filestorage/Types/FileStorageFileResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class FileStorageFileResponse
+public record FileStorageFileResponse
 {
     [JsonPropertyName("model")]
-    public File Model { get; init; }
+    public required File Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FileStorageFolderResponse.cs b/src/Merge.Client/Filestorage/Types/FileStorageFolderResponse.cs
index 1f4b0eb1..3b05e21f 100644
--- a/src/Merge.Client/Filestorage/Types/FileStorageFolderResponse.cs
+++ b/src/Merge.Client/Filestorage/Types/FileStorageFolderResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class FileStorageFolderResponse
+public record FileStorageFolderResponse
 {
     [JsonPropertyName("model")]
-    public Folder Model { get; init; }
+    public required Folder Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/Folder.cs b/src/Merge.Client/Filestorage/Types/Folder.cs
index a040669b..5c1649b4 100644
--- a/src/Merge.Client/Filestorage/Types/Folder.cs
+++ b/src/Merge.Client/Filestorage/Types/Folder.cs
@@ -1,72 +1,71 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class Folder
+public record Folder
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The folder's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The URL to access the folder.
     /// </summary>
     [JsonPropertyName("folder_url")]
-    public string? FolderUrl { get; init; }
+    public string? FolderUrl { get; set; }
 
     /// <summary>
     /// The folder's size, in bytes.
     /// </summary>
     [JsonPropertyName("size")]
-    public int? Size { get; init; }
+    public long? Size { get; set; }
 
     /// <summary>
     /// The folder's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The folder that the folder belongs to.
     /// </summary>
     [JsonPropertyName("parent_folder")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Folder>>))]
-    public OneOf<string, Folder>? ParentFolder { get; init; }
+    public OneOf<string, Folder>? ParentFolder { get; set; }
 
     /// <summary>
     /// The drive that the folder belongs to.
     /// </summary>
     [JsonPropertyName("drive")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Drive>>))]
-    public OneOf<string, Drive>? Drive { get; init; }
+    public OneOf<string, Drive>? Drive { get; set; }
 
     /// <summary>
     /// The Permission object is used to represent a user's or group's access to a File or Folder. Permissions are unexpanded by default. Use the query param `expand=permissions` to see more details under `GET /folders`.
@@ -81,29 +80,29 @@ public OneOf<
         string,
         PermissionRequest,
         IEnumerable<OneOf<string, PermissionRequest>>
-    >? Permissions { get; init; }
+    >? Permissions { get; set; }
 
     /// <summary>
     /// When the third party's folder was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's folder was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<Dictionary<string, object>>? RemoteData { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/FolderRequest.cs b/src/Merge.Client/Filestorage/Types/FolderRequest.cs
index 9fe815f4..3c5dede1 100644
--- a/src/Merge.Client/Filestorage/Types/FolderRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/FolderRequest.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class FolderRequest
+public record FolderRequest
 {
     /// <summary>
     /// The folder's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The URL to access the folder.
     /// </summary>
     [JsonPropertyName("folder_url")]
-    public string? FolderUrl { get; init; }
+    public string? FolderUrl { get; set; }
 
     /// <summary>
     /// The folder's size, in bytes.
     /// </summary>
     [JsonPropertyName("size")]
-    public int? Size { get; init; }
+    public long? Size { get; set; }
 
     /// <summary>
     /// The folder's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The folder that the folder belongs to.
     /// </summary>
     [JsonPropertyName("parent_folder")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Folder>>))]
-    public OneOf<string, Folder>? ParentFolder { get; init; }
+    public OneOf<string, Folder>? ParentFolder { get; set; }
 
     /// <summary>
     /// The drive that the folder belongs to.
     /// </summary>
     [JsonPropertyName("drive")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Drive>>))]
-    public OneOf<string, Drive>? Drive { get; init; }
+    public OneOf<string, Drive>? Drive { get; set; }
 
     /// <summary>
     /// The Permission object is used to represent a user's or group's access to a File or Folder. Permissions are unexpanded by default. Use the query param `expand=permissions` to see more details under `GET /folders`.
@@ -60,11 +59,11 @@ public OneOf<
         string,
         PermissionRequest,
         IEnumerable<OneOf<string, PermissionRequest>>
-    >? Permissions { get; init; }
+    >? Permissions { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/Group.cs b/src/Merge.Client/Filestorage/Types/Group.cs
index 22448012..e2e3ee4f 100644
--- a/src/Merge.Client/Filestorage/Types/Group.cs
+++ b/src/Merge.Client/Filestorage/Types/Group.cs
@@ -4,50 +4,50 @@
 
 namespace Merge.Client.Filestorage;
 
-public class Group
+public record Group
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The group's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The users that belong in the group. If null, this typically means it's either a domain or the third-party platform does not surface this information.
     /// </summary>
     [JsonPropertyName("users")]
-    public IEnumerable<string> Users { get; init; }
+    public IEnumerable<string> Users { get; set; } = new List<string>();
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<Dictionary<string, object>>? RemoteData { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/IndividualCommonModelScopeDeserializer.cs b/src/Merge.Client/Filestorage/Types/IndividualCommonModelScopeDeserializer.cs
index b057033e..e684e2fa 100644
--- a/src/Merge.Client/Filestorage/Types/IndividualCommonModelScopeDeserializer.cs
+++ b/src/Merge.Client/Filestorage/Types/IndividualCommonModelScopeDeserializer.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class IndividualCommonModelScopeDeserializer
+public record IndividualCommonModelScopeDeserializer
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializer? FieldPermissions { get; init; }
+    public FieldPermissionDeserializer? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/IndividualCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Filestorage/Types/IndividualCommonModelScopeDeserializerRequest.cs
index 9b606e22..bb00ce73 100644
--- a/src/Merge.Client/Filestorage/Types/IndividualCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/IndividualCommonModelScopeDeserializerRequest.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class IndividualCommonModelScopeDeserializerRequest
+public record IndividualCommonModelScopeDeserializerRequest
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializerRequest? FieldPermissions { get; init; }
+    public FieldPermissionDeserializerRequest? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/Issue.cs b/src/Merge.Client/Filestorage/Types/Issue.cs
index 806f205e..961110a5 100644
--- a/src/Merge.Client/Filestorage/Types/Issue.cs
+++ b/src/Merge.Client/Filestorage/Types/Issue.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class Issue
+public record Issue
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -17,23 +16,23 @@ public class Issue
     /// - `RESOLVED` - RESOLVED
     /// </summary>
     [JsonPropertyName("status")]
-    public IssueStatusEnum? Status { get; init; }
+    public IssueStatusEnum? Status { get; set; }
 
     [JsonPropertyName("error_description")]
-    public string ErrorDescription { get; init; }
+    public required string ErrorDescription { get; set; }
 
     [JsonPropertyName("end_user")]
-    public Dictionary<string, object>? EndUser { get; init; }
+    public Dictionary<string, object?>? EndUser { get; set; }
 
     [JsonPropertyName("first_incident_time")]
-    public DateTime? FirstIncidentTime { get; init; }
+    public DateTime? FirstIncidentTime { get; set; }
 
     [JsonPropertyName("last_incident_time")]
-    public DateTime? LastIncidentTime { get; init; }
+    public DateTime? LastIncidentTime { get; set; }
 
     [JsonPropertyName("is_muted")]
-    public bool? IsMuted { get; init; }
+    public bool? IsMuted { get; set; }
 
     [JsonPropertyName("error_details")]
-    public IEnumerable<string>? ErrorDetails { get; init; }
+    public IEnumerable<string>? ErrorDetails { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/IssueStatusEnum.cs b/src/Merge.Client/Filestorage/Types/IssueStatusEnum.cs
index 0b70986e..6c1a89ae 100644
--- a/src/Merge.Client/Filestorage/Types/IssueStatusEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/IssueStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/LinkToken.cs b/src/Merge.Client/Filestorage/Types/LinkToken.cs
index 8beeedf3..2e562560 100644
--- a/src/Merge.Client/Filestorage/Types/LinkToken.cs
+++ b/src/Merge.Client/Filestorage/Types/LinkToken.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Filestorage;
 
-public class LinkToken
+public record LinkToken
 {
     [JsonPropertyName("link_token")]
-    public string LinkToken_ { get; init; }
+    public required string LinkToken_ { get; set; }
 
     [JsonPropertyName("integration_name")]
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     [JsonPropertyName("magic_link_url")]
-    public string? MagicLinkUrl { get; init; }
+    public string? MagicLinkUrl { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/LinkedAccountStatus.cs b/src/Merge.Client/Filestorage/Types/LinkedAccountStatus.cs
index 361fcd21..6726c227 100644
--- a/src/Merge.Client/Filestorage/Types/LinkedAccountStatus.cs
+++ b/src/Merge.Client/Filestorage/Types/LinkedAccountStatus.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Filestorage;
 
-public class LinkedAccountStatus
+public record LinkedAccountStatus
 {
     [JsonPropertyName("linked_account_status")]
-    public string LinkedAccountStatus_ { get; init; }
+    public required string LinkedAccountStatus_ { get; set; }
 
     [JsonPropertyName("can_make_request")]
-    public bool CanMakeRequest { get; init; }
+    public required bool CanMakeRequest { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/MetaResponse.cs b/src/Merge.Client/Filestorage/Types/MetaResponse.cs
index cfef8983..744ffb82 100644
--- a/src/Merge.Client/Filestorage/Types/MetaResponse.cs
+++ b/src/Merge.Client/Filestorage/Types/MetaResponse.cs
@@ -1,24 +1,24 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class MetaResponse
+public record MetaResponse
 {
     [JsonPropertyName("request_schema")]
-    public Dictionary<string, object> RequestSchema { get; init; }
+    public Dictionary<string, object?> RequestSchema { get; set; } =
+        new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_field_classes")]
-    public Dictionary<string, object>? RemoteFieldClasses { get; init; }
+    public Dictionary<string, object?>? RemoteFieldClasses { get; set; }
 
     [JsonPropertyName("status")]
-    public LinkedAccountStatus? Status { get; init; }
+    public LinkedAccountStatus? Status { get; set; }
 
     [JsonPropertyName("has_conditional_params")]
-    public bool HasConditionalParams { get; init; }
+    public required bool HasConditionalParams { get; set; }
 
     [JsonPropertyName("has_required_linked_account_params")]
-    public bool HasRequiredLinkedAccountParams { get; init; }
+    public required bool HasRequiredLinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/MethodEnum.cs b/src/Merge.Client/Filestorage/Types/MethodEnum.cs
index 332de2a6..fde38dfe 100644
--- a/src/Merge.Client/Filestorage/Types/MethodEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/MethodEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/ModelOperation.cs b/src/Merge.Client/Filestorage/Types/ModelOperation.cs
index a936cf93..ce2cd3c2 100644
--- a/src/Merge.Client/Filestorage/Types/ModelOperation.cs
+++ b/src/Merge.Client/Filestorage/Types/ModelOperation.cs
@@ -4,17 +4,17 @@
 
 namespace Merge.Client.Filestorage;
 
-public class ModelOperation
+public record ModelOperation
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("available_operations")]
-    public IEnumerable<string> AvailableOperations { get; init; }
+    public IEnumerable<string> AvailableOperations { get; set; } = new List<string>();
 
     [JsonPropertyName("required_post_parameters")]
-    public IEnumerable<string> RequiredPostParameters { get; init; }
+    public IEnumerable<string> RequiredPostParameters { get; set; } = new List<string>();
 
     [JsonPropertyName("supported_fields")]
-    public IEnumerable<string> SupportedFields { get; init; }
+    public IEnumerable<string> SupportedFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Filestorage/Types/ModelPermissionDeserializer.cs b/src/Merge.Client/Filestorage/Types/ModelPermissionDeserializer.cs
index 94daa031..6cceddf4 100644
--- a/src/Merge.Client/Filestorage/Types/ModelPermissionDeserializer.cs
+++ b/src/Merge.Client/Filestorage/Types/ModelPermissionDeserializer.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Filestorage;
 
-public class ModelPermissionDeserializer
+public record ModelPermissionDeserializer
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/ModelPermissionDeserializerRequest.cs b/src/Merge.Client/Filestorage/Types/ModelPermissionDeserializerRequest.cs
index a486f5c7..68cf0918 100644
--- a/src/Merge.Client/Filestorage/Types/ModelPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/ModelPermissionDeserializerRequest.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Filestorage;
 
-public class ModelPermissionDeserializerRequest
+public record ModelPermissionDeserializerRequest
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/MultipartFormFieldRequest.cs b/src/Merge.Client/Filestorage/Types/MultipartFormFieldRequest.cs
index a2dd32e5..d09405a9 100644
--- a/src/Merge.Client/Filestorage/Types/MultipartFormFieldRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/MultipartFormFieldRequest.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class MultipartFormFieldRequest
+public record MultipartFormFieldRequest
 {
     /// <summary>
     /// The name of the form field
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// The data for the form field.
     /// </summary>
     [JsonPropertyName("data")]
-    public string Data { get; init; }
+    public required string Data { get; set; }
 
     /// <summary>
     /// The encoding of the value of `data`. Defaults to `RAW` if not defined.
@@ -27,17 +26,17 @@ public class MultipartFormFieldRequest
     /// - `GZIP_BASE64` - GZIP_BASE64
     /// </summary>
     [JsonPropertyName("encoding")]
-    public EncodingEnum? Encoding { get; init; }
+    public EncodingEnum? Encoding { get; set; }
 
     /// <summary>
     /// The file name of the form field, if the field is for a file.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The MIME type of the file, if the field is for a file.
     /// </summary>
     [JsonPropertyName("content_type")]
-    public string? ContentType { get; init; }
+    public string? ContentType { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedAccountDetailsAndActionsList.cs b/src/Merge.Client/Filestorage/Types/PaginatedAccountDetailsAndActionsList.cs
index b8d032d8..bc04e583 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedAccountDetailsAndActionsList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedAccountDetailsAndActionsList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedAccountDetailsAndActionsList
+public record PaginatedAccountDetailsAndActionsList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AccountDetailsAndActions>? Results { get; init; }
+    public IEnumerable<AccountDetailsAndActions>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedAuditLogEventList.cs b/src/Merge.Client/Filestorage/Types/PaginatedAuditLogEventList.cs
index fd5624ea..d62c69fd 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedAuditLogEventList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedAuditLogEventList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedAuditLogEventList
+public record PaginatedAuditLogEventList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AuditLogEvent>? Results { get; init; }
+    public IEnumerable<AuditLogEvent>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedDriveList.cs b/src/Merge.Client/Filestorage/Types/PaginatedDriveList.cs
index b79962e4..bf3b7b18 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedDriveList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedDriveList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedDriveList
+public record PaginatedDriveList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Drive>? Results { get; init; }
+    public IEnumerable<Drive>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedFileList.cs b/src/Merge.Client/Filestorage/Types/PaginatedFileList.cs
index 2cd787e1..ee5dc36f 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedFileList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedFileList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedFileList
+public record PaginatedFileList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<File>? Results { get; init; }
+    public IEnumerable<File>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedFolderList.cs b/src/Merge.Client/Filestorage/Types/PaginatedFolderList.cs
index 28ae07f7..7dddbfbe 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedFolderList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedFolderList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedFolderList
+public record PaginatedFolderList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Folder>? Results { get; init; }
+    public IEnumerable<Folder>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedGroupList.cs b/src/Merge.Client/Filestorage/Types/PaginatedGroupList.cs
index fddb5698..39da993d 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedGroupList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedGroupList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedGroupList
+public record PaginatedGroupList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Group>? Results { get; init; }
+    public IEnumerable<Group>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedIssueList.cs b/src/Merge.Client/Filestorage/Types/PaginatedIssueList.cs
index 7b6691da..2c06a582 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedIssueList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedIssueList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedIssueList
+public record PaginatedIssueList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Issue>? Results { get; init; }
+    public IEnumerable<Issue>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedSyncStatusList.cs b/src/Merge.Client/Filestorage/Types/PaginatedSyncStatusList.cs
index 07c94b9d..344c94b4 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedSyncStatusList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedSyncStatusList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedSyncStatusList
+public record PaginatedSyncStatusList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<SyncStatus>? Results { get; init; }
+    public IEnumerable<SyncStatus>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PaginatedUserList.cs b/src/Merge.Client/Filestorage/Types/PaginatedUserList.cs
index e6aaefe7..9f7cee71 100644
--- a/src/Merge.Client/Filestorage/Types/PaginatedUserList.cs
+++ b/src/Merge.Client/Filestorage/Types/PaginatedUserList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PaginatedUserList
+public record PaginatedUserList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<User>? Results { get; init; }
+    public IEnumerable<User>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/Permission.cs b/src/Merge.Client/Filestorage/Types/Permission.cs
index bd27748a..eab7d92d 100644
--- a/src/Merge.Client/Filestorage/Types/Permission.cs
+++ b/src/Merge.Client/Filestorage/Types/Permission.cs
@@ -1,48 +1,47 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class Permission
+public record Permission
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The user that is granted this permission.
     /// </summary>
     [JsonPropertyName("user")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? User { get; init; }
+    public OneOf<string, User>? User { get; set; }
 
     /// <summary>
     /// The group that is granted this permission.
     /// </summary>
     [JsonPropertyName("group")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Group>>))]
-    public OneOf<string, Group>? Group { get; init; }
+    public OneOf<string, Group>? Group { get; set; }
 
     /// <summary>
     /// Denotes what type of people have access to the file.
@@ -53,11 +52,11 @@ public class Permission
     /// - `ANYONE` - ANYONE
     /// </summary>
     [JsonPropertyName("type")]
-    public TypeEnum? Type { get; init; }
+    public TypeEnum? Type { get; set; }
 
     /// <summary>
     /// The permissions that the user or group has for the File or Folder. It is possible for a user or group to have multiple roles, such as viewing & uploading. Possible values include: `READ`, `WRITE`, `OWNER`. In cases where there is no clear mapping, the original value passed through will be returned.
     /// </summary>
     [JsonPropertyName("roles")]
-    public IEnumerable<RolesEnum>? Roles { get; init; }
+    public IEnumerable<RolesEnum>? Roles { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/PermissionRequest.cs b/src/Merge.Client/Filestorage/Types/PermissionRequest.cs
index 93ae144b..3b242153 100644
--- a/src/Merge.Client/Filestorage/Types/PermissionRequest.cs
+++ b/src/Merge.Client/Filestorage/Types/PermissionRequest.cs
@@ -1,33 +1,32 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class PermissionRequest
+public record PermissionRequest
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The user that is granted this permission.
     /// </summary>
     [JsonPropertyName("user")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? User { get; init; }
+    public OneOf<string, User>? User { get; set; }
 
     /// <summary>
     /// The group that is granted this permission.
     /// </summary>
     [JsonPropertyName("group")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Group>>))]
-    public OneOf<string, Group>? Group { get; init; }
+    public OneOf<string, Group>? Group { get; set; }
 
     /// <summary>
     /// Denotes what type of people have access to the file.
@@ -38,17 +37,17 @@ public class PermissionRequest
     /// - `ANYONE` - ANYONE
     /// </summary>
     [JsonPropertyName("type")]
-    public TypeEnum? Type { get; init; }
+    public TypeEnum? Type { get; set; }
 
     /// <summary>
     /// The permissions that the user or group has for the File or Folder. It is possible for a user or group to have multiple roles, such as viewing & uploading. Possible values include: `READ`, `WRITE`, `OWNER`. In cases where there is no clear mapping, the original value passed through will be returned.
     /// </summary>
     [JsonPropertyName("roles")]
-    public IEnumerable<RolesEnum>? Roles { get; init; }
+    public IEnumerable<RolesEnum>? Roles { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/RemoteEndpointInfo.cs b/src/Merge.Client/Filestorage/Types/RemoteEndpointInfo.cs
index 8c3def5f..aea27c95 100644
--- a/src/Merge.Client/Filestorage/Types/RemoteEndpointInfo.cs
+++ b/src/Merge.Client/Filestorage/Types/RemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Filestorage;
 
-public class RemoteEndpointInfo
+public record RemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string UrlPath { get; init; }
+    public required string UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<object> FieldTraversalPath { get; init; }
+    public IEnumerable<object> FieldTraversalPath { get; set; } = new List<object>();
 }
diff --git a/src/Merge.Client/Filestorage/Types/RemoteFieldApi.cs b/src/Merge.Client/Filestorage/Types/RemoteFieldApi.cs
index 83aeea92..87401fa3 100644
--- a/src/Merge.Client/Filestorage/Types/RemoteFieldApi.cs
+++ b/src/Merge.Client/Filestorage/Types/RemoteFieldApi.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class RemoteFieldApi
+public record RemoteFieldApi
 {
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("remote_endpoint_info")]
-    public RemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required RemoteEndpointInfo RemoteEndpointInfo { get; set; }
 
     [JsonPropertyName("example_values")]
-    public IEnumerable<object>? ExampleValues { get; init; }
+    public IEnumerable<object>? ExampleValues { get; set; }
 
     [JsonPropertyName("advanced_metadata")]
-    public AdvancedMetadata? AdvancedMetadata { get; init; }
+    public AdvancedMetadata? AdvancedMetadata { get; set; }
 
     [JsonPropertyName("coverage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<int, double>>))]
-    public OneOf<int, double>? Coverage { get; init; }
+    public OneOf<int, double>? Coverage { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/RemoteFieldApiResponse.cs b/src/Merge.Client/Filestorage/Types/RemoteFieldApiResponse.cs
index 9d8a72cc..07b64104 100644
--- a/src/Merge.Client/Filestorage/Types/RemoteFieldApiResponse.cs
+++ b/src/Merge.Client/Filestorage/Types/RemoteFieldApiResponse.cs
@@ -1,24 +1,23 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class RemoteFieldApiResponse
+public record RemoteFieldApiResponse
 {
     [JsonPropertyName("File")]
-    public IEnumerable<RemoteFieldApi>? File { get; init; }
+    public IEnumerable<RemoteFieldApi>? File { get; set; }
 
     [JsonPropertyName("Folder")]
-    public IEnumerable<RemoteFieldApi>? Folder { get; init; }
+    public IEnumerable<RemoteFieldApi>? Folder { get; set; }
 
     [JsonPropertyName("Drive")]
-    public IEnumerable<RemoteFieldApi>? Drive { get; init; }
+    public IEnumerable<RemoteFieldApi>? Drive { get; set; }
 
     [JsonPropertyName("Group")]
-    public IEnumerable<RemoteFieldApi>? Group { get; init; }
+    public IEnumerable<RemoteFieldApi>? Group { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<RemoteFieldApi>? User { get; init; }
+    public IEnumerable<RemoteFieldApi>? User { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/RemoteKey.cs b/src/Merge.Client/Filestorage/Types/RemoteKey.cs
index 251416f2..3ac2c423 100644
--- a/src/Merge.Client/Filestorage/Types/RemoteKey.cs
+++ b/src/Merge.Client/Filestorage/Types/RemoteKey.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Filestorage;
 
-public class RemoteKey
+public record RemoteKey
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("key")]
-    public string Key { get; init; }
+    public required string Key { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/RemoteResponse.cs b/src/Merge.Client/Filestorage/Types/RemoteResponse.cs
index 8b3abed0..a8c4c147 100644
--- a/src/Merge.Client/Filestorage/Types/RemoteResponse.cs
+++ b/src/Merge.Client/Filestorage/Types/RemoteResponse.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class RemoteResponse
+public record RemoteResponse
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("status")]
-    public int Status { get; init; }
+    public required int Status { get; set; }
 
     [JsonPropertyName("response")]
-    public object Response { get; init; }
+    public required object Response { get; set; }
 
     [JsonPropertyName("response_headers")]
-    public Dictionary<string, object>? ResponseHeaders { get; init; }
+    public Dictionary<string, object?>? ResponseHeaders { get; set; }
 
     [JsonPropertyName("response_type")]
-    public ResponseTypeEnum? ResponseType { get; init; }
+    public ResponseTypeEnum? ResponseType { get; set; }
 
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/RequestFormatEnum.cs b/src/Merge.Client/Filestorage/Types/RequestFormatEnum.cs
index d1c168fa..e1da6a1f 100644
--- a/src/Merge.Client/Filestorage/Types/RequestFormatEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/RequestFormatEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/ResponseTypeEnum.cs b/src/Merge.Client/Filestorage/Types/ResponseTypeEnum.cs
index 3a86e0ea..0785056d 100644
--- a/src/Merge.Client/Filestorage/Types/ResponseTypeEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/ResponseTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/RoleEnum.cs b/src/Merge.Client/Filestorage/Types/RoleEnum.cs
index f1042caa..7264e60a 100644
--- a/src/Merge.Client/Filestorage/Types/RoleEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/RoleEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/RolesEnum.cs b/src/Merge.Client/Filestorage/Types/RolesEnum.cs
index e0cd869a..524c1777 100644
--- a/src/Merge.Client/Filestorage/Types/RolesEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/RolesEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/SelectiveSyncConfigurationsUsageEnum.cs b/src/Merge.Client/Filestorage/Types/SelectiveSyncConfigurationsUsageEnum.cs
index facdd6b5..069ed925 100644
--- a/src/Merge.Client/Filestorage/Types/SelectiveSyncConfigurationsUsageEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/SelectiveSyncConfigurationsUsageEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/SyncStatus.cs b/src/Merge.Client/Filestorage/Types/SyncStatus.cs
index 398c1e78..bfeef40f 100644
--- a/src/Merge.Client/Filestorage/Types/SyncStatus.cs
+++ b/src/Merge.Client/Filestorage/Types/SyncStatus.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class SyncStatus
+public record SyncStatus
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("last_sync_start")]
-    public DateTime? LastSyncStart { get; init; }
+    public DateTime? LastSyncStart { get; set; }
 
     [JsonPropertyName("next_sync_start")]
-    public DateTime? NextSyncStart { get; init; }
+    public DateTime? NextSyncStart { get; set; }
 
     [JsonPropertyName("status")]
-    public SyncStatusStatusEnum Status { get; init; }
+    public required SyncStatusStatusEnum Status { get; set; }
 
     [JsonPropertyName("is_initial_sync")]
-    public bool IsInitialSync { get; init; }
+    public required bool IsInitialSync { get; set; }
 
     [JsonPropertyName("selective_sync_configurations_usage")]
-    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; init; }
+    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/SyncStatusStatusEnum.cs b/src/Merge.Client/Filestorage/Types/SyncStatusStatusEnum.cs
index 4b450c3c..5747a674 100644
--- a/src/Merge.Client/Filestorage/Types/SyncStatusStatusEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/SyncStatusStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/TypeEnum.cs b/src/Merge.Client/Filestorage/Types/TypeEnum.cs
index 1e9246c7..2cba4fcb 100644
--- a/src/Merge.Client/Filestorage/Types/TypeEnum.cs
+++ b/src/Merge.Client/Filestorage/Types/TypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Filestorage/Types/User.cs b/src/Merge.Client/Filestorage/Types/User.cs
index 89f26518..1c4ffe36 100644
--- a/src/Merge.Client/Filestorage/Types/User.cs
+++ b/src/Merge.Client/Filestorage/Types/User.cs
@@ -4,56 +4,56 @@
 
 namespace Merge.Client.Filestorage;
 
-public class User
+public record User
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The user's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The user's email address. This is typically used to identify a user across linked accounts.
     /// </summary>
     [JsonPropertyName("email_address")]
-    public string? EmailAddress { get; init; }
+    public string? EmailAddress { get; set; }
 
     /// <summary>
     /// Whether the user is the one who linked this account.
     /// </summary>
     [JsonPropertyName("is_me")]
-    public bool? IsMe { get; init; }
+    public bool? IsMe { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<Dictionary<string, object>>? RemoteData { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/ValidationProblemSource.cs b/src/Merge.Client/Filestorage/Types/ValidationProblemSource.cs
index d0ee4868..e3482267 100644
--- a/src/Merge.Client/Filestorage/Types/ValidationProblemSource.cs
+++ b/src/Merge.Client/Filestorage/Types/ValidationProblemSource.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Filestorage;
 
-public class ValidationProblemSource
+public record ValidationProblemSource
 {
     [JsonPropertyName("pointer")]
-    public string Pointer { get; init; }
+    public required string Pointer { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/WarningValidationProblem.cs b/src/Merge.Client/Filestorage/Types/WarningValidationProblem.cs
index f16524e6..b4bc8931 100644
--- a/src/Merge.Client/Filestorage/Types/WarningValidationProblem.cs
+++ b/src/Merge.Client/Filestorage/Types/WarningValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Filestorage;
 
 #nullable enable
 
 namespace Merge.Client.Filestorage;
 
-public class WarningValidationProblem
+public record WarningValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Types/WebhookReceiver.cs b/src/Merge.Client/Filestorage/Types/WebhookReceiver.cs
index a38c5ade..eee71ab9 100644
--- a/src/Merge.Client/Filestorage/Types/WebhookReceiver.cs
+++ b/src/Merge.Client/Filestorage/Types/WebhookReceiver.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Filestorage;
 
-public class WebhookReceiver
+public record WebhookReceiver
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Users/Requests/UsersListRequest.cs b/src/Merge.Client/Filestorage/Users/Requests/UsersListRequest.cs
index 2d524277..46f660c5 100644
--- a/src/Merge.Client/Filestorage/Users/Requests/UsersListRequest.cs
+++ b/src/Merge.Client/Filestorage/Users/Requests/UsersListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Filestorage;
 
-public class UsersListRequest
+public record UsersListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return the user object for requestor.
     /// </summary>
-    public string? IsMe { get; init; }
+    public string? IsMe { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Users/Requests/UsersRetrieveRequest.cs b/src/Merge.Client/Filestorage/Users/Requests/UsersRetrieveRequest.cs
index ffb4a463..67d27769 100644
--- a/src/Merge.Client/Filestorage/Users/Requests/UsersRetrieveRequest.cs
+++ b/src/Merge.Client/Filestorage/Users/Requests/UsersRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Filestorage;
 
-public class UsersRetrieveRequest
+public record UsersRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/Users/UsersClient.cs b/src/Merge.Client/Filestorage/Users/UsersClient.cs
index 9fdfd26a..424072b6 100644
--- a/src/Merge.Client/Filestorage/Users/UsersClient.cs
+++ b/src/Merge.Client/Filestorage/Users/UsersClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public UsersClient(RawClient client)
     /// <summary>
     /// Returns a list of `User` objects.
     /// </summary>
-    public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
+    public async Task<PaginatedUserList> ListAsync(
+        UsersListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -64,23 +73,41 @@ public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "filestorage/v1/users",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedUserList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedUserList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `User` object with the given `id`.
     /// </summary>
-    public async Task<User> RetrieveAsync(string id, UsersRetrieveRequest request)
+    public async Task<User> RetrieveAsync(
+        string id,
+        UsersRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -90,16 +117,30 @@ public async Task<User> RetrieveAsync(string id, UsersRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"filestorage/v1/users/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<User>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<User>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Filestorage/WebhookReceivers/Requests/WebhookReceiverRequest.cs b/src/Merge.Client/Filestorage/WebhookReceivers/Requests/WebhookReceiverRequest.cs
index 489f9777..08812a15 100644
--- a/src/Merge.Client/Filestorage/WebhookReceivers/Requests/WebhookReceiverRequest.cs
+++ b/src/Merge.Client/Filestorage/WebhookReceivers/Requests/WebhookReceiverRequest.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Filestorage;
 
-public class WebhookReceiverRequest
+public record WebhookReceiverRequest
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Filestorage/WebhookReceivers/WebhookReceiversClient.cs b/src/Merge.Client/Filestorage/WebhookReceivers/WebhookReceiversClient.cs
index dcb35d06..8eba40ae 100644
--- a/src/Merge.Client/Filestorage/WebhookReceivers/WebhookReceiversClient.cs
+++ b/src/Merge.Client/Filestorage/WebhookReceivers/WebhookReceiversClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Filestorage;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,72 @@ public WebhookReceiversClient(RawClient client)
     /// <summary>
     /// Returns a list of `WebhookReceiver` objects.
     /// </summary>
-    public async Task<IEnumerable<WebhookReceiver>> ListAsync()
+    public async Task<IEnumerable<WebhookReceiver>> ListAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "filestorage/v1/webhook-receivers"
+                Path = "filestorage/v1/webhook-receivers",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<WebhookReceiver>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<WebhookReceiver>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `WebhookReceiver` object with the given values.
     /// </summary>
-    public async Task<WebhookReceiver> CreateAsync(WebhookReceiverRequest request)
+    public async Task<WebhookReceiver> CreateAsync(
+        WebhookReceiverRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "filestorage/v1/webhook-receivers",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<WebhookReceiver>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<WebhookReceiver>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/AccountDetails/AccountDetailsClient.cs b/src/Merge.Client/Hris/AccountDetails/AccountDetailsClient.cs
index c59a1fdc..a43f10e4 100644
--- a/src/Merge.Client/Hris/AccountDetails/AccountDetailsClient.cs
+++ b/src/Merge.Client/Hris/AccountDetails/AccountDetailsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AccountDetailsClient(RawClient client)
     /// <summary>
     /// Get details for a linked account.
     /// </summary>
-    public async Task<AccountDetails> RetrieveAsync()
+    public async Task<AccountDetails> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/account-details"
+                Path = "hris/v1/account-details",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountDetails>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountDetails>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/AccountToken/AccountTokenClient.cs b/src/Merge.Client/Hris/AccountToken/AccountTokenClient.cs
index 51bf2161..7eef999a 100644
--- a/src/Merge.Client/Hris/AccountToken/AccountTokenClient.cs
+++ b/src/Merge.Client/Hris/AccountToken/AccountTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,37 @@ public AccountTokenClient(RawClient client)
     /// <summary>
     /// Returns the account token for the end user with the provided public token.
     /// </summary>
-    public async Task<AccountToken> RetrieveAsync(string publicToken)
+    public async Task<AccountToken> RetrieveAsync(
+        string publicToken,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"hris/v1/account-token/{publicToken}"
+                Path = $"hris/v1/account-token/{publicToken}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/AsyncPassthrough/AsyncPassthroughClient.cs b/src/Merge.Client/Hris/AsyncPassthrough/AsyncPassthroughClient.cs
index 75553113..c3744a44 100644
--- a/src/Merge.Client/Hris/AsyncPassthrough/AsyncPassthroughClient.cs
+++ b/src/Merge.Client/Hris/AsyncPassthrough/AsyncPassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,75 @@ public AsyncPassthroughClient(RawClient client)
     /// <summary>
     /// Asynchronously pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<AsyncPassthroughReciept> CreateAsync(DataPassthroughRequest request)
+    public async Task<AsyncPassthroughReciept> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/async-passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AsyncPassthroughReciept>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AsyncPassthroughReciept>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Retrieves data from earlier async-passthrough POST request
     /// </summary>
-    public async Task<RemoteResponse> RetrieveAsync(string asyncPassthroughReceiptId)
+    public async Task<RemoteResponse> RetrieveAsync(
+        string asyncPassthroughReceiptId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"hris/v1/async-passthrough/{asyncPassthroughReceiptId}"
+                Path = $"hris/v1/async-passthrough/{asyncPassthroughReceiptId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/AuditTrail/AuditTrailClient.cs b/src/Merge.Client/Hris/AuditTrail/AuditTrailClient.cs
index b532a221..7cd714c7 100644
--- a/src/Merge.Client/Hris/AuditTrail/AuditTrailClient.cs
+++ b/src/Merge.Client/Hris/AuditTrail/AuditTrailClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AuditTrailClient(RawClient client)
     /// <summary>
     /// Gets a list of audit trail events.
     /// </summary>
-    public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest request)
+    public async Task<PaginatedAuditLogEventList> ListAsync(
+        AuditTrailListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -48,16 +51,30 @@ public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/audit-trail",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAuditLogEventList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAuditLogEventList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/AuditTrail/Requests/AuditTrailListRequest.cs b/src/Merge.Client/Hris/AuditTrail/Requests/AuditTrailListRequest.cs
index 9be46ad5..46e389ec 100644
--- a/src/Merge.Client/Hris/AuditTrail/Requests/AuditTrailListRequest.cs
+++ b/src/Merge.Client/Hris/AuditTrail/Requests/AuditTrailListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Hris;
 
-public class AuditTrailListRequest
+public record AuditTrailListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
     /// <summary>
     /// If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`, `END_USER_CREDENTIALS_ACCESSED`
     /// </summary>
-    public string? EventType { get; init; }
+    public string? EventType { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// If provided, this will return events associated with the specified user email. Please note that the email address reflects the user's email at the time of the event, and may not be their current email.
     /// </summary>
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 }
diff --git a/src/Merge.Client/Hris/AvailableActions/AvailableActionsClient.cs b/src/Merge.Client/Hris/AvailableActions/AvailableActionsClient.cs
index 5da0f49d..c11e080f 100644
--- a/src/Merge.Client/Hris/AvailableActions/AvailableActionsClient.cs
+++ b/src/Merge.Client/Hris/AvailableActions/AvailableActionsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AvailableActionsClient(RawClient client)
     /// <summary>
     /// Returns a list of models and actions available for an account.
     /// </summary>
-    public async Task<AvailableActions> RetrieveAsync()
+    public async Task<AvailableActions> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/available-actions"
+                Path = "hris/v1/available-actions",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AvailableActions>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AvailableActions>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/BankInfo/BankInfoClient.cs b/src/Merge.Client/Hris/BankInfo/BankInfoClient.cs
index d819204f..d1f8bade 100644
--- a/src/Merge.Client/Hris/BankInfo/BankInfoClient.cs
+++ b/src/Merge.Client/Hris/BankInfo/BankInfoClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public BankInfoClient(RawClient client)
     /// <summary>
     /// Returns a list of `BankInfo` objects.
     /// </summary>
-    public async Task<PaginatedBankInfoList> ListAsync(BankInfoListRequest request)
+    public async Task<PaginatedBankInfoList> ListAsync(
+        BankInfoListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountType != null)
@@ -31,11 +34,13 @@ public async Task<PaginatedBankInfoList> ListAsync(BankInfoListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +64,15 @@ public async Task<PaginatedBankInfoList> ListAsync(BankInfoListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.OrderBy != null)
         {
@@ -88,23 +97,41 @@ public async Task<PaginatedBankInfoList> ListAsync(BankInfoListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/bank-info",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedBankInfoList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedBankInfoList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `BankInfo` object with the given `id`.
     /// </summary>
-    public async Task<BankInfo> RetrieveAsync(string id, BankInfoRetrieveRequest request)
+    public async Task<BankInfo> RetrieveAsync(
+        string id,
+        BankInfoRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -126,16 +153,30 @@ public async Task<BankInfo> RetrieveAsync(string id, BankInfoRetrieveRequest req
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/bank-info/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<BankInfo>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<BankInfo>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/BankInfo/Requests/BankInfoListRequest.cs b/src/Merge.Client/Hris/BankInfo/Requests/BankInfoListRequest.cs
index ce133cee..9efb1971 100644
--- a/src/Merge.Client/Hris/BankInfo/Requests/BankInfoListRequest.cs
+++ b/src/Merge.Client/Hris/BankInfo/Requests/BankInfoListRequest.cs
@@ -1,10 +1,6 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class BankInfoListRequest
+public record BankInfoListRequest
 {
     /// <summary>
     /// If provided, will only return BankInfo's with this account type. Options: ('SAVINGS', 'CHECKING')
@@ -12,80 +8,80 @@ public class BankInfoListRequest
     /// - `SAVINGS` - SAVINGS
     /// - `CHECKING` - CHECKING
     /// </summary>
-    public BankInfoListRequestAccountType? AccountType { get; init; }
+    public BankInfoListRequestAccountType? AccountType { get; set; }
 
     /// <summary>
     /// If provided, will only return BankInfo's with this bank name.
     /// </summary>
-    public string? BankName { get; init; }
+    public string? BankName { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return bank accounts for this employee.
     /// </summary>
-    public string? EmployeeId { get; init; }
+    public string? EmployeeId { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Overrides the default ordering for this endpoint. Possible values include: remote_created_at, -remote_created_at.
     /// </summary>
-    public BankInfoListRequestOrderBy? OrderBy { get; init; }
+    public BankInfoListRequestOrderBy? OrderBy { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/BankInfo/Requests/BankInfoRetrieveRequest.cs b/src/Merge.Client/Hris/BankInfo/Requests/BankInfoRetrieveRequest.cs
index 43878276..2ca43f88 100644
--- a/src/Merge.Client/Hris/BankInfo/Requests/BankInfoRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/BankInfo/Requests/BankInfoRetrieveRequest.cs
@@ -1,24 +1,24 @@
 namespace Merge.Client.Hris;
 
-public class BankInfoRetrieveRequest
+public record BankInfoRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/BankInfo/Types/BankInfoListRequestAccountType.cs b/src/Merge.Client/Hris/BankInfo/Types/BankInfoListRequestAccountType.cs
index 0bb9f6c5..7c4b05b5 100644
--- a/src/Merge.Client/Hris/BankInfo/Types/BankInfoListRequestAccountType.cs
+++ b/src/Merge.Client/Hris/BankInfo/Types/BankInfoListRequestAccountType.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/BankInfo/Types/BankInfoListRequestOrderBy.cs b/src/Merge.Client/Hris/BankInfo/Types/BankInfoListRequestOrderBy.cs
index 8a201b06..ba316812 100644
--- a/src/Merge.Client/Hris/BankInfo/Types/BankInfoListRequestOrderBy.cs
+++ b/src/Merge.Client/Hris/BankInfo/Types/BankInfoListRequestOrderBy.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Benefits/BenefitsClient.cs b/src/Merge.Client/Hris/Benefits/BenefitsClient.cs
index 717cf2ee..3c078727 100644
--- a/src/Merge.Client/Hris/Benefits/BenefitsClient.cs
+++ b/src/Merge.Client/Hris/Benefits/BenefitsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public BenefitsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Benefit` objects.
     /// </summary>
-    public async Task<PaginatedBenefitList> ListAsync(BenefitsListRequest request)
+    public async Task<PaginatedBenefitList> ListAsync(
+        BenefitsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedBenefitList> ListAsync(BenefitsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -68,23 +77,41 @@ public async Task<PaginatedBenefitList> ListAsync(BenefitsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/benefits",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedBenefitList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedBenefitList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Benefit` object with the given `id`.
     /// </summary>
-    public async Task<Benefit> RetrieveAsync(string id, BenefitsRetrieveRequest request)
+    public async Task<Benefit> RetrieveAsync(
+        string id,
+        BenefitsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -98,16 +125,30 @@ public async Task<Benefit> RetrieveAsync(string id, BenefitsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/benefits/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Benefit>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Benefit>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Benefits/Requests/BenefitsListRequest.cs b/src/Merge.Client/Hris/Benefits/Requests/BenefitsListRequest.cs
index cba30ecf..eee52180 100644
--- a/src/Merge.Client/Hris/Benefits/Requests/BenefitsListRequest.cs
+++ b/src/Merge.Client/Hris/Benefits/Requests/BenefitsListRequest.cs
@@ -1,59 +1,59 @@
 namespace Merge.Client.Hris;
 
-public class BenefitsListRequest
+public record BenefitsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will return the benefits associated with the employee.
     /// </summary>
-    public string? EmployeeId { get; init; }
+    public string? EmployeeId { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Benefits/Requests/BenefitsRetrieveRequest.cs b/src/Merge.Client/Hris/Benefits/Requests/BenefitsRetrieveRequest.cs
index 256982e1..eafbb628 100644
--- a/src/Merge.Client/Hris/Benefits/Requests/BenefitsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/Benefits/Requests/BenefitsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Hris;
 
-public class BenefitsRetrieveRequest
+public record BenefitsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Companies/CompaniesClient.cs b/src/Merge.Client/Hris/Companies/CompaniesClient.cs
index 0f18be3a..d3269781 100644
--- a/src/Merge.Client/Hris/Companies/CompaniesClient.cs
+++ b/src/Merge.Client/Hris/Companies/CompaniesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public CompaniesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Company` objects.
     /// </summary>
-    public async Task<PaginatedCompanyList> ListAsync(CompaniesListRequest request)
+    public async Task<PaginatedCompanyList> ListAsync(
+        CompaniesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedCompanyList> ListAsync(CompaniesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedCompanyList> ListAsync(CompaniesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/companies",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCompanyList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCompanyList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Company` object with the given `id`.
     /// </summary>
-    public async Task<Company> RetrieveAsync(string id, CompaniesRetrieveRequest request)
+    public async Task<Company> RetrieveAsync(
+        string id,
+        CompaniesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<Company> RetrieveAsync(string id, CompaniesRetrieveRequest req
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/companies/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Company>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Company>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Companies/Requests/CompaniesListRequest.cs b/src/Merge.Client/Hris/Companies/Requests/CompaniesListRequest.cs
index bd8776eb..eb1bc167 100644
--- a/src/Merge.Client/Hris/Companies/Requests/CompaniesListRequest.cs
+++ b/src/Merge.Client/Hris/Companies/Requests/CompaniesListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Hris;
 
-public class CompaniesListRequest
+public record CompaniesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Companies/Requests/CompaniesRetrieveRequest.cs b/src/Merge.Client/Hris/Companies/Requests/CompaniesRetrieveRequest.cs
index 252fefa8..b4d8f9d0 100644
--- a/src/Merge.Client/Hris/Companies/Requests/CompaniesRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/Companies/Requests/CompaniesRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Hris;
 
-public class CompaniesRetrieveRequest
+public record CompaniesRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/DeleteAccount/DeleteAccountClient.cs b/src/Merge.Client/Hris/DeleteAccount/DeleteAccountClient.cs
index 7d6df7d9..91ced298 100644
--- a/src/Merge.Client/Hris/DeleteAccount/DeleteAccountClient.cs
+++ b/src/Merge.Client/Hris/DeleteAccount/DeleteAccountClient.cs
@@ -1,4 +1,5 @@
-using Merge.Client;
+using System.Net.Http;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -16,14 +17,26 @@ public DeleteAccountClient(RawClient client)
     /// <summary>
     /// Delete a linked account.
     /// </summary>
-    public async void DeleteAsync()
+    public async Task DeleteAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "hris/v1/delete-account"
+                Path = "hris/v1/delete-account",
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Dependents/DependentsClient.cs b/src/Merge.Client/Hris/Dependents/DependentsClient.cs
index 63a90176..461b189b 100644
--- a/src/Merge.Client/Hris/Dependents/DependentsClient.cs
+++ b/src/Merge.Client/Hris/Dependents/DependentsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public DependentsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Dependent` objects.
     /// </summary>
-    public async Task<PaginatedDependentList> ListAsync(DependentsListRequest request)
+    public async Task<PaginatedDependentList> ListAsync(
+        DependentsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedDependentList> ListAsync(DependentsListRequest reques
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -64,23 +73,41 @@ public async Task<PaginatedDependentList> ListAsync(DependentsListRequest reques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/dependents",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedDependentList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedDependentList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Dependent` object with the given `id`.
     /// </summary>
-    public async Task<Dependent> RetrieveAsync(string id, DependentsRetrieveRequest request)
+    public async Task<Dependent> RetrieveAsync(
+        string id,
+        DependentsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -94,16 +121,30 @@ public async Task<Dependent> RetrieveAsync(string id, DependentsRetrieveRequest
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/dependents/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Dependent>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Dependent>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Dependents/Requests/DependentsListRequest.cs b/src/Merge.Client/Hris/Dependents/Requests/DependentsListRequest.cs
index 52e10e6d..ca99e3f6 100644
--- a/src/Merge.Client/Hris/Dependents/Requests/DependentsListRequest.cs
+++ b/src/Merge.Client/Hris/Dependents/Requests/DependentsListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Hris;
 
-public class DependentsListRequest
+public record DependentsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include sensitive fields (such as social security numbers) in the response.
     /// </summary>
-    public bool? IncludeSensitiveFields { get; init; }
+    public bool? IncludeSensitiveFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Dependents/Requests/DependentsRetrieveRequest.cs b/src/Merge.Client/Hris/Dependents/Requests/DependentsRetrieveRequest.cs
index 2e4938e8..92029f07 100644
--- a/src/Merge.Client/Hris/Dependents/Requests/DependentsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/Dependents/Requests/DependentsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Hris;
 
-public class DependentsRetrieveRequest
+public record DependentsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include sensitive fields (such as social security numbers) in the response.
     /// </summary>
-    public bool? IncludeSensitiveFields { get; init; }
+    public bool? IncludeSensitiveFields { get; set; }
 }
diff --git a/src/Merge.Client/Hris/EmployeePayrollRuns/EmployeePayrollRunsClient.cs b/src/Merge.Client/Hris/EmployeePayrollRuns/EmployeePayrollRunsClient.cs
index 83fbbae4..73a27e16 100644
--- a/src/Merge.Client/Hris/EmployeePayrollRuns/EmployeePayrollRunsClient.cs
+++ b/src/Merge.Client/Hris/EmployeePayrollRuns/EmployeePayrollRunsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,17 +19,20 @@ public EmployeePayrollRunsClient(RawClient client)
     /// Returns a list of `EmployeePayrollRun` objects.
     /// </summary>
     public async Task<PaginatedEmployeePayrollRunList> ListAsync(
-        EmployeePayrollRunsListRequest request
+        EmployeePayrollRunsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -41,11 +44,11 @@ EmployeePayrollRunsListRequest request
         }
         if (request.EndedAfter != null)
         {
-            _query["ended_after"] = request.EndedAfter.Value.ToString("o0");
+            _query["ended_after"] = request.EndedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.EndedBefore != null)
         {
-            _query["ended_before"] = request.EndedBefore.Value.ToString("o0");
+            _query["ended_before"] = request.EndedBefore.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.Expand != null)
         {
@@ -61,11 +64,15 @@ EmployeePayrollRunsListRequest request
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -81,26 +88,42 @@ EmployeePayrollRunsListRequest request
         }
         if (request.StartedAfter != null)
         {
-            _query["started_after"] = request.StartedAfter.Value.ToString("o0");
+            _query["started_after"] = request.StartedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.StartedBefore != null)
         {
-            _query["started_before"] = request.StartedBefore.Value.ToString("o0");
+            _query["started_before"] = request.StartedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/employee-payroll-runs",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedEmployeePayrollRunList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedEmployeePayrollRunList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -108,7 +131,8 @@ EmployeePayrollRunsListRequest request
     /// </summary>
     public async Task<EmployeePayrollRun> RetrieveAsync(
         string id,
-        EmployeePayrollRunsRetrieveRequest request
+        EmployeePayrollRunsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -123,16 +147,30 @@ EmployeePayrollRunsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/employee-payroll-runs/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<EmployeePayrollRun>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<EmployeePayrollRun>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/EmployeePayrollRuns/Requests/EmployeePayrollRunsListRequest.cs b/src/Merge.Client/Hris/EmployeePayrollRuns/Requests/EmployeePayrollRunsListRequest.cs
index 54985d82..37ec8c0c 100644
--- a/src/Merge.Client/Hris/EmployeePayrollRuns/Requests/EmployeePayrollRunsListRequest.cs
+++ b/src/Merge.Client/Hris/EmployeePayrollRuns/Requests/EmployeePayrollRunsListRequest.cs
@@ -1,88 +1,84 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class EmployeePayrollRunsListRequest
+public record EmployeePayrollRunsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return employee payroll runs for this employee.
     /// </summary>
-    public string? EmployeeId { get; init; }
+    public string? EmployeeId { get; set; }
 
     /// <summary>
     /// If provided, will only return employee payroll runs ended after this datetime.
     /// </summary>
-    public DateTime? EndedAfter { get; init; }
+    public DateTime? EndedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return employee payroll runs ended before this datetime.
     /// </summary>
-    public DateTime? EndedBefore { get; init; }
+    public DateTime? EndedBefore { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public EmployeePayrollRunsListRequestExpand? Expand { get; init; }
+    public EmployeePayrollRunsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return employee payroll runs for this employee.
     /// </summary>
-    public string? PayrollRunId { get; init; }
+    public string? PayrollRunId { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return employee payroll runs started after this datetime.
     /// </summary>
-    public DateTime? StartedAfter { get; init; }
+    public DateTime? StartedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return employee payroll runs started before this datetime.
     /// </summary>
-    public DateTime? StartedBefore { get; init; }
+    public DateTime? StartedBefore { get; set; }
 }
diff --git a/src/Merge.Client/Hris/EmployeePayrollRuns/Requests/EmployeePayrollRunsRetrieveRequest.cs b/src/Merge.Client/Hris/EmployeePayrollRuns/Requests/EmployeePayrollRunsRetrieveRequest.cs
index f45a9475..c768e4c8 100644
--- a/src/Merge.Client/Hris/EmployeePayrollRuns/Requests/EmployeePayrollRunsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/EmployeePayrollRuns/Requests/EmployeePayrollRunsRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class EmployeePayrollRunsRetrieveRequest
+public record EmployeePayrollRunsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public EmployeePayrollRunsRetrieveRequestExpand? Expand { get; init; }
+    public EmployeePayrollRunsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/EmployeePayrollRuns/Types/EmployeePayrollRunsListRequestExpand.cs b/src/Merge.Client/Hris/EmployeePayrollRuns/Types/EmployeePayrollRunsListRequestExpand.cs
index 71bde39f..3891e5f6 100644
--- a/src/Merge.Client/Hris/EmployeePayrollRuns/Types/EmployeePayrollRunsListRequestExpand.cs
+++ b/src/Merge.Client/Hris/EmployeePayrollRuns/Types/EmployeePayrollRunsListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/EmployeePayrollRuns/Types/EmployeePayrollRunsRetrieveRequestExpand.cs b/src/Merge.Client/Hris/EmployeePayrollRuns/Types/EmployeePayrollRunsRetrieveRequestExpand.cs
index 5ce27bf0..909908bc 100644
--- a/src/Merge.Client/Hris/EmployeePayrollRuns/Types/EmployeePayrollRunsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Hris/EmployeePayrollRuns/Types/EmployeePayrollRunsRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employees/EmployeesClient.cs b/src/Merge.Client/Hris/Employees/EmployeesClient.cs
index 89750da7..0ebb5e18 100644
--- a/src/Merge.Client/Hris/Employees/EmployeesClient.cs
+++ b/src/Merge.Client/Hris/Employees/EmployeesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public EmployeesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Employee` objects.
     /// </summary>
-    public async Task<PaginatedEmployeeList> ListAsync(EmployeesListRequest request)
+    public async Task<PaginatedEmployeeList> ListAsync(
+        EmployeesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CompanyId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedEmployeeList> ListAsync(EmployeesListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -91,11 +96,15 @@ public async Task<PaginatedEmployeeList> ListAsync(EmployeesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -123,11 +132,13 @@ public async Task<PaginatedEmployeeList> ListAsync(EmployeesListRequest request)
         }
         if (request.StartedAfter != null)
         {
-            _query["started_after"] = request.StartedAfter.Value.ToString("o0");
+            _query["started_after"] = request.StartedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.StartedBefore != null)
         {
-            _query["started_before"] = request.StartedBefore.Value.ToString("o0");
+            _query["started_before"] = request.StartedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.TeamId != null)
         {
@@ -135,11 +146,15 @@ public async Task<PaginatedEmployeeList> ListAsync(EmployeesListRequest request)
         }
         if (request.TerminatedAfter != null)
         {
-            _query["terminated_after"] = request.TerminatedAfter.Value.ToString("o0");
+            _query["terminated_after"] = request.TerminatedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.TerminatedBefore != null)
         {
-            _query["terminated_before"] = request.TerminatedBefore.Value.ToString("o0");
+            _query["terminated_before"] = request.TerminatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.WorkEmail != null)
         {
@@ -152,23 +167,40 @@ public async Task<PaginatedEmployeeList> ListAsync(EmployeesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/employees",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedEmployeeList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedEmployeeList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Employee` object with the given values.
     /// </summary>
-    public async Task<EmployeeResponse> CreateAsync(EmployeeEndpointRequest request)
+    public async Task<EmployeeResponse> CreateAsync(
+        EmployeeEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -182,23 +214,41 @@ public async Task<EmployeeResponse> CreateAsync(EmployeeEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/employees",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<EmployeeResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<EmployeeResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Employee` object with the given `id`.
     /// </summary>
-    public async Task<Employee> RetrieveAsync(string id, EmployeesRetrieveRequest request)
+    public async Task<Employee> RetrieveAsync(
+        string id,
+        EmployeesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -224,51 +274,95 @@ public async Task<Employee> RetrieveAsync(string id, EmployeesRetrieveRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/employees/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Employee>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Employee>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Ignores a specific row based on the `model_id` in the url. These records will have their properties set to null, and will not be updated in future syncs. The "reason" and "message" fields in the request body will be stored for audit purposes.
     /// </summary>
-    public async void IgnoreCreateAsync(string modelId, IgnoreCommonModelRequest request)
+    public async Task IgnoreCreateAsync(
+        string modelId,
+        IgnoreCommonModelRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = $"hris/v1/employees/ignore/{modelId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Employee` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/employees/meta/post"
+                Path = "hris/v1/employees/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Employees/Requests/EmployeeEndpointRequest.cs b/src/Merge.Client/Hris/Employees/Requests/EmployeeEndpointRequest.cs
index 0cad6f6d..fc2a783d 100644
--- a/src/Merge.Client/Hris/Employees/Requests/EmployeeEndpointRequest.cs
+++ b/src/Merge.Client/Hris/Employees/Requests/EmployeeEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class EmployeeEndpointRequest
+public record EmployeeEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public EmployeeRequest Model { get; init; }
+    public required EmployeeRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Employees/Requests/EmployeesListRequest.cs b/src/Merge.Client/Hris/Employees/Requests/EmployeesListRequest.cs
index ad8491a3..4300e781 100644
--- a/src/Merge.Client/Hris/Employees/Requests/EmployeesListRequest.cs
+++ b/src/Merge.Client/Hris/Employees/Requests/EmployeesListRequest.cs
@@ -1,35 +1,31 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class EmployeesListRequest
+public record EmployeesListRequest
 {
     /// <summary>
     /// If provided, will only return employees for this company.
     /// </summary>
-    public string? CompanyId { get; init; }
+    public string? CompanyId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return employees with this display name.
     /// </summary>
-    public string? DisplayFullName { get; init; }
+    public string? DisplayFullName { get; set; }
 
     /// <summary>
     /// If provided, will only return employees with this employment status.
@@ -38,135 +34,135 @@ public class EmployeesListRequest
     /// - `PENDING` - PENDING
     /// - `INACTIVE` - INACTIVE
     /// </summary>
-    public EmployeesListRequestEmploymentStatus? EmploymentStatus { get; init; }
+    public EmployeesListRequestEmploymentStatus? EmploymentStatus { get; set; }
 
     /// <summary>
     /// If provided, will only return employees that have an employment of the specified employment_type.
     /// </summary>
-    public string? EmploymentType { get; init; }
+    public string? EmploymentType { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public EmployeesListRequestExpand? Expand { get; init; }
+    public EmployeesListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// If provided, will only return employees with this first name.
     /// </summary>
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// If provided, will only return employees matching the group ids; multiple groups can be separated by commas.
     /// </summary>
-    public string? Groups { get; init; }
+    public string? Groups { get; set; }
 
     /// <summary>
     /// If provided, will only return employees for this home location.
     /// </summary>
-    public string? HomeLocationId { get; init; }
+    public string? HomeLocationId { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include sensitive fields (such as social security numbers) in the response.
     /// </summary>
-    public bool? IncludeSensitiveFields { get; init; }
+    public bool? IncludeSensitiveFields { get; set; }
 
     /// <summary>
     /// If provided, will only return employees that have an employment of the specified job_title.
     /// </summary>
-    public string? JobTitle { get; init; }
+    public string? JobTitle { get; set; }
 
     /// <summary>
     /// If provided, will only return employees with this last name.
     /// </summary>
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// If provided, will only return employees for this manager.
     /// </summary>
-    public string? ManagerId { get; init; }
+    public string? ManagerId { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return employees for this pay group
     /// </summary>
-    public string? PayGroupId { get; init; }
+    public string? PayGroupId { get; set; }
 
     /// <summary>
     /// If provided, will only return Employees with this personal email
     /// </summary>
-    public string? PersonalEmail { get; init; }
+    public string? PersonalEmail { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public EmployeesListRequestRemoteFields? RemoteFields { get; init; }
+    public EmployeesListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public EmployeesListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public EmployeesListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return employees that started after this datetime.
     /// </summary>
-    public DateTime? StartedAfter { get; init; }
+    public DateTime? StartedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return employees that started before this datetime.
     /// </summary>
-    public DateTime? StartedBefore { get; init; }
+    public DateTime? StartedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return employees for this team.
     /// </summary>
-    public string? TeamId { get; init; }
+    public string? TeamId { get; set; }
 
     /// <summary>
     /// If provided, will only return employees that were terminated after this datetime.
     /// </summary>
-    public DateTime? TerminatedAfter { get; init; }
+    public DateTime? TerminatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return employees that were terminated before this datetime.
     /// </summary>
-    public DateTime? TerminatedBefore { get; init; }
+    public DateTime? TerminatedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return Employees with this work email
     /// </summary>
-    public string? WorkEmail { get; init; }
+    public string? WorkEmail { get; set; }
 
     /// <summary>
     /// If provided, will only return employees for this location.
     /// </summary>
-    public string? WorkLocationId { get; init; }
+    public string? WorkLocationId { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Employees/Requests/EmployeesRetrieveRequest.cs b/src/Merge.Client/Hris/Employees/Requests/EmployeesRetrieveRequest.cs
index 502bc16a..9d5224f1 100644
--- a/src/Merge.Client/Hris/Employees/Requests/EmployeesRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/Employees/Requests/EmployeesRetrieveRequest.cs
@@ -1,33 +1,29 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class EmployeesRetrieveRequest
+public record EmployeesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public EmployeesRetrieveRequestExpand? Expand { get; init; }
+    public EmployeesRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include sensitive fields (such as social security numbers) in the response.
     /// </summary>
-    public bool? IncludeSensitiveFields { get; init; }
+    public bool? IncludeSensitiveFields { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public EmployeesRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public EmployeesRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public EmployeesRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public EmployeesRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Employees/Requests/IgnoreCommonModelRequest.cs b/src/Merge.Client/Hris/Employees/Requests/IgnoreCommonModelRequest.cs
index 2a7ad773..2c3e5f18 100644
--- a/src/Merge.Client/Hris/Employees/Requests/IgnoreCommonModelRequest.cs
+++ b/src/Merge.Client/Hris/Employees/Requests/IgnoreCommonModelRequest.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class IgnoreCommonModelRequest
+public record IgnoreCommonModelRequest
 {
     [JsonPropertyName("reason")]
-    public ReasonEnum Reason { get; init; }
+    public required ReasonEnum Reason { get; set; }
 
     [JsonPropertyName("message")]
-    public string? Message { get; init; }
+    public string? Message { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestEmploymentStatus.cs b/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestEmploymentStatus.cs
index 5081273d..d79a0edd 100644
--- a/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestEmploymentStatus.cs
+++ b/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestEmploymentStatus.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestExpand.cs b/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestExpand.cs
index 182fa5a7..3a897937 100644
--- a/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestExpand.cs
+++ b/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestRemoteFields.cs b/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestRemoteFields.cs
index 39d79f29..1f38fa37 100644
--- a/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestRemoteFields.cs
+++ b/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestShowEnumOrigins.cs b/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestShowEnumOrigins.cs
index 839f0cf5..2e518d61 100644
--- a/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Hris/Employees/Types/EmployeesListRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestExpand.cs b/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestExpand.cs
index 218c79e6..23d8cebf 100644
--- a/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestRemoteFields.cs b/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestRemoteFields.cs
index 4044aec3..a6b51886 100644
--- a/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestShowEnumOrigins.cs
index 672072ba..f9e4dfb4 100644
--- a/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Hris/Employees/Types/EmployeesRetrieveRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/EmployerBenefits/EmployerBenefitsClient.cs b/src/Merge.Client/Hris/EmployerBenefits/EmployerBenefitsClient.cs
index 802c5963..c028e719 100644
--- a/src/Merge.Client/Hris/EmployerBenefits/EmployerBenefitsClient.cs
+++ b/src/Merge.Client/Hris/EmployerBenefits/EmployerBenefitsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public EmployerBenefitsClient(RawClient client)
     /// <summary>
     /// Returns a list of `EmployerBenefit` objects.
     /// </summary>
-    public async Task<PaginatedEmployerBenefitList> ListAsync(EmployerBenefitsListRequest request)
+    public async Task<PaginatedEmployerBenefitList> ListAsync(
+        EmployerBenefitsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedEmployerBenefitList> ListAsync(EmployerBenefitsListRe
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,17 +69,31 @@ public async Task<PaginatedEmployerBenefitList> ListAsync(EmployerBenefitsListRe
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/employer-benefits",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedEmployerBenefitList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedEmployerBenefitList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -78,7 +101,8 @@ public async Task<PaginatedEmployerBenefitList> ListAsync(EmployerBenefitsListRe
     /// </summary>
     public async Task<EmployerBenefit> RetrieveAsync(
         string id,
-        EmployerBenefitsRetrieveRequest request
+        EmployerBenefitsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -89,16 +113,30 @@ EmployerBenefitsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/employer-benefits/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<EmployerBenefit>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<EmployerBenefit>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/EmployerBenefits/Requests/EmployerBenefitsListRequest.cs b/src/Merge.Client/Hris/EmployerBenefits/Requests/EmployerBenefitsListRequest.cs
index 145175a2..cc7e6e22 100644
--- a/src/Merge.Client/Hris/EmployerBenefits/Requests/EmployerBenefitsListRequest.cs
+++ b/src/Merge.Client/Hris/EmployerBenefits/Requests/EmployerBenefitsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Hris;
 
-public class EmployerBenefitsListRequest
+public record EmployerBenefitsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Hris/EmployerBenefits/Requests/EmployerBenefitsRetrieveRequest.cs b/src/Merge.Client/Hris/EmployerBenefits/Requests/EmployerBenefitsRetrieveRequest.cs
index c2a72493..0868ae54 100644
--- a/src/Merge.Client/Hris/EmployerBenefits/Requests/EmployerBenefitsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/EmployerBenefits/Requests/EmployerBenefitsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Hris;
 
-public class EmployerBenefitsRetrieveRequest
+public record EmployerBenefitsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Employments/EmploymentsClient.cs b/src/Merge.Client/Hris/Employments/EmploymentsClient.cs
index d4e78ff1..be509513 100644
--- a/src/Merge.Client/Hris/Employments/EmploymentsClient.cs
+++ b/src/Merge.Client/Hris/Employments/EmploymentsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public EmploymentsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Employment` objects.
     /// </summary>
-    public async Task<PaginatedEmploymentList> ListAsync(EmploymentsListRequest request)
+    public async Task<PaginatedEmploymentList> ListAsync(
+        EmploymentsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedEmploymentList> ListAsync(EmploymentsListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.OrderBy != null)
         {
@@ -80,23 +89,41 @@ public async Task<PaginatedEmploymentList> ListAsync(EmploymentsListRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/employments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedEmploymentList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedEmploymentList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Employment` object with the given `id`.
     /// </summary>
-    public async Task<Employment> RetrieveAsync(string id, EmploymentsRetrieveRequest request)
+    public async Task<Employment> RetrieveAsync(
+        string id,
+        EmploymentsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -118,16 +145,30 @@ public async Task<Employment> RetrieveAsync(string id, EmploymentsRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/employments/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Employment>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Employment>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Employments/Requests/EmploymentsListRequest.cs b/src/Merge.Client/Hris/Employments/Requests/EmploymentsListRequest.cs
index fb5f8229..96e2a12c 100644
--- a/src/Merge.Client/Hris/Employments/Requests/EmploymentsListRequest.cs
+++ b/src/Merge.Client/Hris/Employments/Requests/EmploymentsListRequest.cs
@@ -1,78 +1,74 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class EmploymentsListRequest
+public record EmploymentsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return employments for this employee.
     /// </summary>
-    public string? EmployeeId { get; init; }
+    public string? EmployeeId { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public EmploymentsListRequestExpand? Expand { get; init; }
+    public EmploymentsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Overrides the default ordering for this endpoint. Possible values include: effective_date, -effective_date.
     /// </summary>
-    public EmploymentsListRequestOrderBy? OrderBy { get; init; }
+    public EmploymentsListRequestOrderBy? OrderBy { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public EmploymentsListRequestRemoteFields? RemoteFields { get; init; }
+    public EmploymentsListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public EmploymentsListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public EmploymentsListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Employments/Requests/EmploymentsRetrieveRequest.cs b/src/Merge.Client/Hris/Employments/Requests/EmploymentsRetrieveRequest.cs
index 004dfebd..b0a05754 100644
--- a/src/Merge.Client/Hris/Employments/Requests/EmploymentsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/Employments/Requests/EmploymentsRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class EmploymentsRetrieveRequest
+public record EmploymentsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public EmploymentsRetrieveRequestExpand? Expand { get; init; }
+    public EmploymentsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public EmploymentsRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public EmploymentsRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public EmploymentsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public EmploymentsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestExpand.cs b/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestExpand.cs
index fec582ce..1b36658d 100644
--- a/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestExpand.cs
+++ b/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestOrderBy.cs b/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestOrderBy.cs
index 57ff60a8..e65bc8c3 100644
--- a/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestOrderBy.cs
+++ b/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestOrderBy.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestRemoteFields.cs b/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestRemoteFields.cs
index e51012b0..86a0ba6c 100644
--- a/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestRemoteFields.cs
+++ b/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestShowEnumOrigins.cs b/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestShowEnumOrigins.cs
index abe85e9a..a4234c82 100644
--- a/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Hris/Employments/Types/EmploymentsListRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestExpand.cs b/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestExpand.cs
index a0219888..44a88112 100644
--- a/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestRemoteFields.cs b/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestRemoteFields.cs
index 000ef280..e2ea21dc 100644
--- a/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestShowEnumOrigins.cs
index 2b340296..0ea01fe0 100644
--- a/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Hris/Employments/Types/EmploymentsRetrieveRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/FieldMapping/FieldMappingClient.cs b/src/Merge.Client/Hris/FieldMapping/FieldMappingClient.cs
index b0940db6..29282833 100644
--- a/src/Merge.Client/Hris/FieldMapping/FieldMappingClient.cs
+++ b/src/Merge.Client/Hris/FieldMapping/FieldMappingClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,64 +18,112 @@ public FieldMappingClient(RawClient client)
     /// <summary>
     /// Get all Field Mappings for this Linked Account. Field Mappings are mappings between third-party Remote Fields and user defined Merge fields. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
-    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync()
+    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/field-mappings"
+                Path = "hris/v1/field-mappings",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingApiInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingApiInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Create new Field Mappings that will be available after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsCreateAsync(
-        CreateFieldMappingRequest request
+        CreateFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/field-mappings",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Deletes Field Mappings for a Linked Account. All data related to this Field Mapping will be deleted and these changes will be reflected after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
-    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string fieldMappingId)
+    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(
+        string fieldMappingId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Delete,
-                Path = $"hris/v1/field-mappings/{fieldMappingId}"
+                Path = $"hris/v1/field-mappings/{fieldMappingId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -83,30 +131,46 @@ public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsPartialUpdateAsync(
         string fieldMappingId,
-        PatchedEditFieldMappingRequest request
+        PatchedEditFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"hris/v1/field-mappings/{fieldMappingId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all remote fields for a Linked Account. Remote fields are third-party fields that are accessible after initial sync if remote_data is enabled. You can use remote fields to override existing Merge fields or map a new Merge field. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
     public async Task<RemoteFieldApiResponse> RemoteFieldsRetrieveAsync(
-        RemoteFieldsRetrieveRequest request
+        RemoteFieldsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -121,32 +185,66 @@ RemoteFieldsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/remote-fields",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all organization-wide Target Fields, this will not include any Linked Account specific Target Fields. Organization-wide Target Fields are additional fields appended to the Merge Common Model for all Linked Accounts in a category. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/target-fields/).
     /// </summary>
-    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync()
+    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = "hris/v1/target-fields" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = "hris/v1/target-fields",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ExternalTargetFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ExternalTargetFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/FieldMapping/Requests/CreateFieldMappingRequest.cs b/src/Merge.Client/Hris/FieldMapping/Requests/CreateFieldMappingRequest.cs
index f227a764..cfe23450 100644
--- a/src/Merge.Client/Hris/FieldMapping/Requests/CreateFieldMappingRequest.cs
+++ b/src/Merge.Client/Hris/FieldMapping/Requests/CreateFieldMappingRequest.cs
@@ -4,41 +4,41 @@
 
 namespace Merge.Client.Hris;
 
-public class CreateFieldMappingRequest
+public record CreateFieldMappingRequest
 {
     /// <summary>
     /// The name of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_name")]
-    public string TargetFieldName { get; init; }
+    public required string TargetFieldName { get; set; }
 
     /// <summary>
     /// The description of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_description")]
-    public string TargetFieldDescription { get; init; }
+    public required string TargetFieldDescription { get; set; }
 
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object> RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object> RemoteFieldTraversalPath { get; set; } = new List<object>();
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string RemoteMethod { get; init; }
+    public required string RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string RemoteUrlPath { get; init; }
+    public required string RemoteUrlPath { get; set; }
 
     /// <summary>
     /// The name of the Common Model that the remote field corresponds to in a given category.
     /// </summary>
     [JsonPropertyName("common_model_name")]
-    public string CommonModelName { get; init; }
+    public required string CommonModelName { get; set; }
 }
diff --git a/src/Merge.Client/Hris/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs b/src/Merge.Client/Hris/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
index c8c9255f..3232dd3f 100644
--- a/src/Merge.Client/Hris/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
+++ b/src/Merge.Client/Hris/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Hris;
 
-public class PatchedEditFieldMappingRequest
+public record PatchedEditFieldMappingRequest
 {
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object>? RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object>? RemoteFieldTraversalPath { get; set; }
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string? RemoteMethod { get; init; }
+    public string? RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string? RemoteUrlPath { get; init; }
+    public string? RemoteUrlPath { get; set; }
 }
diff --git a/src/Merge.Client/Hris/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs b/src/Merge.Client/Hris/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
index 10bd6cc8..6b22b59e 100644
--- a/src/Merge.Client/Hris/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Hris;
 
-public class RemoteFieldsRetrieveRequest
+public record RemoteFieldsRetrieveRequest
 {
     /// <summary>
     /// A comma seperated list of Common Model names. If included, will only return Remote Fields for those Common Models.
     /// </summary>
-    public string? CommonModels { get; init; }
+    public string? CommonModels { get; set; }
 
     /// <summary>
     /// If true, will include example values, where available, for remote fields in the 3rd party platform. These examples come from active data from your customers.
     /// </summary>
-    public string? IncludeExampleValues { get; init; }
+    public string? IncludeExampleValues { get; set; }
 }
diff --git a/src/Merge.Client/Hris/ForceResync/ForceResyncClient.cs b/src/Merge.Client/Hris/ForceResync/ForceResyncClient.cs
index c58a1f5d..cb81dd96 100644
--- a/src/Merge.Client/Hris/ForceResync/ForceResyncClient.cs
+++ b/src/Merge.Client/Hris/ForceResync/ForceResyncClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,36 @@ public ForceResyncClient(RawClient client)
     /// <summary>
     /// Force re-sync of all models. This is available for all organizations via the dashboard. Force re-sync is also available programmatically via API for monthly, quarterly, and highest sync frequency customers on the Launch, Professional, or Enterprise plans. Doing so will consume a sync credit for the relevant linked account.
     /// </summary>
-    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync()
+    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "hris/v1/sync-status/resync"
+                Path = "hris/v1/sync-status/resync",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<SyncStatus>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<SyncStatus>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/GenerateKey/GenerateKeyClient.cs b/src/Merge.Client/Hris/GenerateKey/GenerateKeyClient.cs
index a60ef0ba..ca76b68e 100644
--- a/src/Merge.Client/Hris/GenerateKey/GenerateKeyClient.cs
+++ b/src/Merge.Client/Hris/GenerateKey/GenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public GenerateKeyClient(RawClient client)
     /// <summary>
     /// Create a remote key.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(GenerateRemoteKeyRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        GenerateRemoteKeyRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/generate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/GenerateKey/Requests/GenerateRemoteKeyRequest.cs b/src/Merge.Client/Hris/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
index 77e92907..c415f20c 100644
--- a/src/Merge.Client/Hris/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
+++ b/src/Merge.Client/Hris/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Hris;
 
-public class GenerateRemoteKeyRequest
+public record GenerateRemoteKeyRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Groups/GroupsClient.cs b/src/Merge.Client/Hris/Groups/GroupsClient.cs
index 296ecb87..b97f86b0 100644
--- a/src/Merge.Client/Hris/Groups/GroupsClient.cs
+++ b/src/Merge.Client/Hris/Groups/GroupsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public GroupsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Group` objects.
     /// </summary>
-    public async Task<PaginatedGroupList> ListAsync(GroupsListRequest request)
+    public async Task<PaginatedGroupList> ListAsync(
+        GroupsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedGroupList> ListAsync(GroupsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Names != null)
         {
@@ -80,23 +89,41 @@ public async Task<PaginatedGroupList> ListAsync(GroupsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/groups",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedGroupList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedGroupList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Group` object with the given `id`.
     /// </summary>
-    public async Task<Group> RetrieveAsync(string id, GroupsRetrieveRequest request)
+    public async Task<Group> RetrieveAsync(
+        string id,
+        GroupsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -114,16 +141,30 @@ public async Task<Group> RetrieveAsync(string id, GroupsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/groups/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Group>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Group>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Groups/Requests/GroupsListRequest.cs b/src/Merge.Client/Hris/Groups/Requests/GroupsListRequest.cs
index a4cf8c7f..1007a9a2 100644
--- a/src/Merge.Client/Hris/Groups/Requests/GroupsListRequest.cs
+++ b/src/Merge.Client/Hris/Groups/Requests/GroupsListRequest.cs
@@ -1,74 +1,74 @@
 namespace Merge.Client.Hris;
 
-public class GroupsListRequest
+public record GroupsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, specifies whether to return only Group objects which refer to a team in the third party platform. Note that this is an opinionated view based on how a team may be represented in the third party platform.
     /// </summary>
-    public string? IsCommonlyUsedAsTeam { get; init; }
+    public string? IsCommonlyUsedAsTeam { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return groups with these names. Multiple values can be separated by commas.
     /// </summary>
-    public string? Names { get; init; }
+    public string? Names { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return groups of these types. Multiple values can be separated by commas.
     /// </summary>
-    public string? Types { get; init; }
+    public string? Types { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Groups/Requests/GroupsRetrieveRequest.cs b/src/Merge.Client/Hris/Groups/Requests/GroupsRetrieveRequest.cs
index ca9fc360..b2a78620 100644
--- a/src/Merge.Client/Hris/Groups/Requests/GroupsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/Groups/Requests/GroupsRetrieveRequest.cs
@@ -1,19 +1,19 @@
 namespace Merge.Client.Hris;
 
-public class GroupsRetrieveRequest
+public record GroupsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/HrisClient.cs b/src/Merge.Client/Hris/HrisClient.cs
index 00f436c4..83eb51ae 100644
--- a/src/Merge.Client/Hris/HrisClient.cs
+++ b/src/Merge.Client/Hris/HrisClient.cs
@@ -1,5 +1,4 @@
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Issues/IssuesClient.cs b/src/Merge.Client/Hris/Issues/IssuesClient.cs
index 7e8711a8..b0e9ee6b 100644
--- a/src/Merge.Client/Hris/Issues/IssuesClient.cs
+++ b/src/Merge.Client/Hris/Issues/IssuesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public IssuesClient(RawClient client)
     /// <summary>
     /// Gets all issues for Organization.
     /// </summary>
-    public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
+    public async Task<PaginatedIssueList> ListAsync(
+        IssuesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountToken != null)
@@ -40,13 +43,13 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         if (request.FirstIncidentTimeAfter != null)
         {
             _query["first_incident_time_after"] = request.FirstIncidentTimeAfter.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.FirstIncidentTimeBefore != null)
         {
             _query["first_incident_time_before"] = request.FirstIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.IncludeMuted != null)
@@ -59,12 +62,14 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         }
         if (request.LastIncidentTimeAfter != null)
         {
-            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString("o0");
+            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.LastIncidentTimeBefore != null)
         {
             _query["last_incident_time_before"] = request.LastIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.LinkedAccountId != null)
@@ -86,32 +91,64 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/issues",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedIssueList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedIssueList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get a specific issue.
     /// </summary>
-    public async Task<Issue> RetrieveAsync(string id)
+    public async Task<Issue> RetrieveAsync(string id, RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
-            new RawClient.JsonApiRequest { Method = HttpMethod.Get, Path = $"hris/v1/issues/{id}" }
+            new RawClient.JsonApiRequest
+            {
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethod.Get,
+                Path = $"hris/v1/issues/{id}",
+                Options = options
+            }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Issue>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Issue>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Issues/Requests/IssuesListRequest.cs b/src/Merge.Client/Hris/Issues/Requests/IssuesListRequest.cs
index 48fcf5a2..adf5565b 100644
--- a/src/Merge.Client/Hris/Issues/Requests/IssuesListRequest.cs
+++ b/src/Merge.Client/Hris/Issues/Requests/IssuesListRequest.cs
@@ -1,66 +1,62 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class IssuesListRequest
+public record IssuesListRequest
 {
-    public string? AccountToken { get; init; }
+    public string? AccountToken { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was after this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeAfter { get; init; }
+    public DateTime? FirstIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was before this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeBefore { get; init; }
+    public DateTime? FirstIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If true, will include muted issues
     /// </summary>
-    public string? IncludeMuted { get; init; }
+    public string? IncludeMuted { get; set; }
 
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was after this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeAfter { get; init; }
+    public DateTime? LastIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was before this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeBefore { get; init; }
+    public DateTime? LastIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If provided, will only include issues pertaining to the linked account passed in.
     /// </summary>
-    public string? LinkedAccountId { get; init; }
+    public string? LinkedAccountId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -68,5 +64,5 @@ public class IssuesListRequest
     /// - `ONGOING` - ONGOING
     /// - `RESOLVED` - RESOLVED
     /// </summary>
-    public IssuesListRequestStatus? Status { get; init; }
+    public IssuesListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Issues/Types/IssuesListRequestStatus.cs b/src/Merge.Client/Hris/Issues/Types/IssuesListRequestStatus.cs
index 86f9cfcb..b110c432 100644
--- a/src/Merge.Client/Hris/Issues/Types/IssuesListRequestStatus.cs
+++ b/src/Merge.Client/Hris/Issues/Types/IssuesListRequestStatus.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/LinkToken/LinkTokenClient.cs b/src/Merge.Client/Hris/LinkToken/LinkTokenClient.cs
index 02402e74..22abec37 100644
--- a/src/Merge.Client/Hris/LinkToken/LinkTokenClient.cs
+++ b/src/Merge.Client/Hris/LinkToken/LinkTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public LinkTokenClient(RawClient client)
     /// <summary>
     /// Creates a link token to be used when linking a new end user.
     /// </summary>
-    public async Task<LinkToken> CreateAsync(EndUserDetailsRequest request)
+    public async Task<LinkToken> CreateAsync(
+        EndUserDetailsRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/link-token",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<LinkToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<LinkToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/LinkToken/Requests/EndUserDetailsRequest.cs b/src/Merge.Client/Hris/LinkToken/Requests/EndUserDetailsRequest.cs
index fd191bc0..1a24c6c5 100644
--- a/src/Merge.Client/Hris/LinkToken/Requests/EndUserDetailsRequest.cs
+++ b/src/Merge.Client/Hris/LinkToken/Requests/EndUserDetailsRequest.cs
@@ -1,65 +1,64 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class EndUserDetailsRequest
+public record EndUserDetailsRequest
 {
     /// <summary>
     /// Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.
     /// </summary>
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// Your end user's organization.
     /// </summary>
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.
     /// </summary>
     [JsonPropertyName("end_user_origin_id")]
-    public string EndUserOriginId { get; init; }
+    public required string EndUserOriginId { get; set; }
 
     /// <summary>
     /// The integration categories to show in Merge Link.
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     /// <summary>
     /// The slug of a specific pre-selected integration for this linking flow token. For examples of slugs, see https://docs.merge.dev/guides/merge-link/single-integration/.
     /// </summary>
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     /// <summary>
     /// An integer number of minutes between [30, 720 or 10080 if for a Magic Link URL] for how long this token is valid. Defaults to 30.
     /// </summary>
     [JsonPropertyName("link_expiry_mins")]
-    public int? LinkExpiryMins { get; init; }
+    public int? LinkExpiryMins { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("should_create_magic_link_url")]
-    public bool? ShouldCreateMagicLinkUrl { get; init; }
+    public bool? ShouldCreateMagicLinkUrl { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL on the Admin Needed screen during the linking flow. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("hide_admin_magic_link")]
-    public bool? HideAdminMagicLink { get; init; }
+    public bool? HideAdminMagicLink { get; set; }
 
     /// <summary>
     /// An array of objects to specify the models and fields that will be disabled for a given Linked Account. Each object uses model_id, enabled_actions, and disabled_fields to specify the model, method, and fields that are scoped for a given Linked Account.
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; init; }
+    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; set; }
 
     /// <summary>
     /// When creating a Link Token, you can set permissions for Common Models that will apply to the account that is going to be linked. Any model or field not specified in link token payload will default to existing settings.
@@ -68,17 +67,17 @@ public class EndUserDetailsRequest
     public Dictionary<
         string,
         IEnumerable<IndividualCommonModelScopeDeserializerRequest>?
-    >? CategoryCommonModelScopes { get; init; }
+    >? CategoryCommonModelScopes { get; set; }
 
     /// <summary>
     /// The language code for the language to localize Merge Link to.
     /// </summary>
     [JsonPropertyName("language")]
-    public string? Language { get; init; }
+    public string? Language { get; set; }
 
     /// <summary>
     /// A JSON object containing integration-specific configuration options.
     /// </summary>
     [JsonPropertyName("integration_specific_config")]
-    public Dictionary<string, object>? IntegrationSpecificConfig { get; init; }
+    public Dictionary<string, object?>? IntegrationSpecificConfig { get; set; }
 }
diff --git a/src/Merge.Client/Hris/LinkedAccounts/LinkedAccountsClient.cs b/src/Merge.Client/Hris/LinkedAccounts/LinkedAccountsClient.cs
index 7592f55f..fe63e0e3 100644
--- a/src/Merge.Client/Hris/LinkedAccounts/LinkedAccountsClient.cs
+++ b/src/Merge.Client/Hris/LinkedAccounts/LinkedAccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,7 +19,8 @@ public LinkedAccountsClient(RawClient client)
     /// List linked accounts for your organization.
     /// </summary>
     public async Task<PaginatedAccountDetailsAndActionsList> ListAsync(
-        LinkedAccountsListRequest request
+        LinkedAccountsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -78,16 +79,30 @@ LinkedAccountsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/linked-accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/LinkedAccounts/Requests/LinkedAccountsListRequest.cs b/src/Merge.Client/Hris/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
index 4cc054fa..9fb3c746 100644
--- a/src/Merge.Client/Hris/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
+++ b/src/Merge.Client/Hris/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
@@ -1,10 +1,6 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class LinkedAccountsListRequest
+public record LinkedAccountsListRequest
 {
     /// <summary>
     /// Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
@@ -17,62 +13,62 @@ public class LinkedAccountsListRequest
     /// - `mktg` - mktg
     /// - `filestorage` - filestorage
     /// </summary>
-    public LinkedAccountsListRequestCategory? Category { get; init; }
+    public LinkedAccountsListRequestCategory? Category { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given email address.
     /// </summary>
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given organization name.
     /// </summary>
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given origin ID.
     /// </summary>
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     /// <summary>
     /// Comma-separated list of EndUser origin IDs, making it possible to specify multiple EndUsers at once.
     /// </summary>
-    public string? EndUserOriginIds { get; init; }
+    public string? EndUserOriginIds { get; set; }
 
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Comma-separated list of LinkedAccount IDs, making it possible to specify multiple LinkedAccounts at once.
     /// </summary>
-    public string? Ids { get; init; }
+    public string? Ids { get; set; }
 
     /// <summary>
     /// If `true`, will include complete production duplicates of the account specified by the `id` query parameter in the response. `id` must be for a complete production linked account.
     /// </summary>
-    public bool? IncludeDuplicates { get; init; }
+    public bool? IncludeDuplicates { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given integration name.
     /// </summary>
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If included, will only include test linked accounts. If not included, will only include non-test linked accounts.
     /// </summary>
-    public string? IsTestAccount { get; init; }
+    public string? IsTestAccount { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Filter by status. Options: `COMPLETE`, `INCOMPLETE`, `RELINK_NEEDED`
     /// </summary>
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 }
diff --git a/src/Merge.Client/Hris/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs b/src/Merge.Client/Hris/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
index 7da8c513..0c79599e 100644
--- a/src/Merge.Client/Hris/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
+++ b/src/Merge.Client/Hris/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Locations/LocationsClient.cs b/src/Merge.Client/Hris/Locations/LocationsClient.cs
index 9d3b0b06..18af6749 100644
--- a/src/Merge.Client/Hris/Locations/LocationsClient.cs
+++ b/src/Merge.Client/Hris/Locations/LocationsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public LocationsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Location` objects.
     /// </summary>
-    public async Task<PaginatedLocationList> ListAsync(LocationsListRequest request)
+    public async Task<PaginatedLocationList> ListAsync(
+        LocationsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedLocationList> ListAsync(LocationsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -72,23 +81,41 @@ public async Task<PaginatedLocationList> ListAsync(LocationsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/locations",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedLocationList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedLocationList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Location` object with the given `id`.
     /// </summary>
-    public async Task<Location> RetrieveAsync(string id, LocationsRetrieveRequest request)
+    public async Task<Location> RetrieveAsync(
+        string id,
+        LocationsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -106,16 +133,30 @@ public async Task<Location> RetrieveAsync(string id, LocationsRetrieveRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/locations/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Location>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Location>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Locations/Requests/LocationsListRequest.cs b/src/Merge.Client/Hris/Locations/Requests/LocationsListRequest.cs
index b4f34545..529e7f3c 100644
--- a/src/Merge.Client/Hris/Locations/Requests/LocationsListRequest.cs
+++ b/src/Merge.Client/Hris/Locations/Requests/LocationsListRequest.cs
@@ -1,35 +1,31 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class LocationsListRequest
+public record LocationsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return locations with this location_type
@@ -37,35 +33,35 @@ public class LocationsListRequest
     /// - `HOME` - HOME
     /// - `WORK` - WORK
     /// </summary>
-    public LocationsListRequestLocationType? LocationType { get; init; }
+    public LocationsListRequestLocationType? LocationType { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Locations/Requests/LocationsRetrieveRequest.cs b/src/Merge.Client/Hris/Locations/Requests/LocationsRetrieveRequest.cs
index acde5e21..96d1b0f5 100644
--- a/src/Merge.Client/Hris/Locations/Requests/LocationsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/Locations/Requests/LocationsRetrieveRequest.cs
@@ -1,19 +1,19 @@
 namespace Merge.Client.Hris;
 
-public class LocationsRetrieveRequest
+public record LocationsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Locations/Types/LocationsListRequestLocationType.cs b/src/Merge.Client/Hris/Locations/Types/LocationsListRequestLocationType.cs
index 77a7728d..7510088f 100644
--- a/src/Merge.Client/Hris/Locations/Types/LocationsListRequestLocationType.cs
+++ b/src/Merge.Client/Hris/Locations/Types/LocationsListRequestLocationType.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Passthrough/PassthroughClient.cs b/src/Merge.Client/Hris/Passthrough/PassthroughClient.cs
index 72d5d071..2cd4b7a5 100644
--- a/src/Merge.Client/Hris/Passthrough/PassthroughClient.cs
+++ b/src/Merge.Client/Hris/Passthrough/PassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public PassthroughClient(RawClient client)
     /// <summary>
     /// Pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<RemoteResponse> CreateAsync(DataPassthroughRequest request)
+    public async Task<RemoteResponse> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/PayGroups/PayGroupsClient.cs b/src/Merge.Client/Hris/PayGroups/PayGroupsClient.cs
index c26e0385..a0c389c5 100644
--- a/src/Merge.Client/Hris/PayGroups/PayGroupsClient.cs
+++ b/src/Merge.Client/Hris/PayGroups/PayGroupsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public PayGroupsClient(RawClient client)
     /// <summary>
     /// Returns a list of `PayGroup` objects.
     /// </summary>
-    public async Task<PaginatedPayGroupList> ListAsync(PayGroupsListRequest request)
+    public async Task<PaginatedPayGroupList> ListAsync(
+        PayGroupsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedPayGroupList> ListAsync(PayGroupsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedPayGroupList> ListAsync(PayGroupsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/pay-groups",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedPayGroupList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedPayGroupList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `PayGroup` object with the given `id`.
     /// </summary>
-    public async Task<PayGroup> RetrieveAsync(string id, PayGroupsRetrieveRequest request)
+    public async Task<PayGroup> RetrieveAsync(
+        string id,
+        PayGroupsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<PayGroup> RetrieveAsync(string id, PayGroupsRetrieveRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/pay-groups/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PayGroup>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PayGroup>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/PayGroups/Requests/PayGroupsListRequest.cs b/src/Merge.Client/Hris/PayGroups/Requests/PayGroupsListRequest.cs
index 00582f4d..64c4bd44 100644
--- a/src/Merge.Client/Hris/PayGroups/Requests/PayGroupsListRequest.cs
+++ b/src/Merge.Client/Hris/PayGroups/Requests/PayGroupsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Hris;
 
-public class PayGroupsListRequest
+public record PayGroupsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Hris/PayGroups/Requests/PayGroupsRetrieveRequest.cs b/src/Merge.Client/Hris/PayGroups/Requests/PayGroupsRetrieveRequest.cs
index 2563e9ac..755c1b3e 100644
--- a/src/Merge.Client/Hris/PayGroups/Requests/PayGroupsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/PayGroups/Requests/PayGroupsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Hris;
 
-public class PayGroupsRetrieveRequest
+public record PayGroupsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/PayrollRuns/PayrollRunsClient.cs b/src/Merge.Client/Hris/PayrollRuns/PayrollRunsClient.cs
index e0ac9813..efd1090b 100644
--- a/src/Merge.Client/Hris/PayrollRuns/PayrollRunsClient.cs
+++ b/src/Merge.Client/Hris/PayrollRuns/PayrollRunsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public PayrollRunsClient(RawClient client)
     /// <summary>
     /// Returns a list of `PayrollRun` objects.
     /// </summary>
-    public async Task<PaginatedPayrollRunList> ListAsync(PayrollRunsListRequest request)
+    public async Task<PaginatedPayrollRunList> ListAsync(
+        PayrollRunsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -35,11 +40,11 @@ public async Task<PaginatedPayrollRunList> ListAsync(PayrollRunsListRequest requ
         }
         if (request.EndedAfter != null)
         {
-            _query["ended_after"] = request.EndedAfter.Value.ToString("o0");
+            _query["ended_after"] = request.EndedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.EndedBefore != null)
         {
-            _query["ended_before"] = request.EndedBefore.Value.ToString("o0");
+            _query["ended_before"] = request.EndedBefore.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.IncludeDeletedData != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedPayrollRunList> ListAsync(PayrollRunsListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -79,32 +88,52 @@ public async Task<PaginatedPayrollRunList> ListAsync(PayrollRunsListRequest requ
         }
         if (request.StartedAfter != null)
         {
-            _query["started_after"] = request.StartedAfter.Value.ToString("o0");
+            _query["started_after"] = request.StartedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.StartedBefore != null)
         {
-            _query["started_before"] = request.StartedBefore.Value.ToString("o0");
+            _query["started_before"] = request.StartedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/payroll-runs",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedPayrollRunList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedPayrollRunList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `PayrollRun` object with the given `id`.
     /// </summary>
-    public async Task<PayrollRun> RetrieveAsync(string id, PayrollRunsRetrieveRequest request)
+    public async Task<PayrollRun> RetrieveAsync(
+        string id,
+        PayrollRunsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -122,16 +151,30 @@ public async Task<PayrollRun> RetrieveAsync(string id, PayrollRunsRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/payroll-runs/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PayrollRun>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PayrollRun>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/PayrollRuns/Requests/PayrollRunsListRequest.cs b/src/Merge.Client/Hris/PayrollRuns/Requests/PayrollRunsListRequest.cs
index 3f0c75d5..e20f0065 100644
--- a/src/Merge.Client/Hris/PayrollRuns/Requests/PayrollRunsListRequest.cs
+++ b/src/Merge.Client/Hris/PayrollRuns/Requests/PayrollRunsListRequest.cs
@@ -1,70 +1,66 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class PayrollRunsListRequest
+public record PayrollRunsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return payroll runs ended after this datetime.
     /// </summary>
-    public DateTime? EndedAfter { get; init; }
+    public DateTime? EndedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return payroll runs ended before this datetime.
     /// </summary>
-    public DateTime? EndedBefore { get; init; }
+    public DateTime? EndedBefore { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public PayrollRunsListRequestRemoteFields? RemoteFields { get; init; }
+    public PayrollRunsListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return PayrollRun's with this status. Options: ('REGULAR', 'OFF_CYCLE', 'CORRECTION', 'TERMINATION', 'SIGN_ON_BONUS')
@@ -75,20 +71,20 @@ public class PayrollRunsListRequest
     /// - `TERMINATION` - TERMINATION
     /// - `SIGN_ON_BONUS` - SIGN_ON_BONUS
     /// </summary>
-    public PayrollRunsListRequestRunType? RunType { get; init; }
+    public PayrollRunsListRequestRunType? RunType { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public PayrollRunsListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public PayrollRunsListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return payroll runs started after this datetime.
     /// </summary>
-    public DateTime? StartedAfter { get; init; }
+    public DateTime? StartedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return payroll runs started before this datetime.
     /// </summary>
-    public DateTime? StartedBefore { get; init; }
+    public DateTime? StartedBefore { get; set; }
 }
diff --git a/src/Merge.Client/Hris/PayrollRuns/Requests/PayrollRunsRetrieveRequest.cs b/src/Merge.Client/Hris/PayrollRuns/Requests/PayrollRunsRetrieveRequest.cs
index 4f86a9a5..a60c78a6 100644
--- a/src/Merge.Client/Hris/PayrollRuns/Requests/PayrollRunsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/PayrollRuns/Requests/PayrollRunsRetrieveRequest.cs
@@ -1,23 +1,19 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class PayrollRunsRetrieveRequest
+public record PayrollRunsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public PayrollRunsRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public PayrollRunsRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public PayrollRunsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public PayrollRunsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestRemoteFields.cs b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestRemoteFields.cs
index dfff450a..cf07a682 100644
--- a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestRemoteFields.cs
+++ b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestRunType.cs b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestRunType.cs
index b45bd2f1..a1b85da8 100644
--- a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestRunType.cs
+++ b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestRunType.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestShowEnumOrigins.cs b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestShowEnumOrigins.cs
index 8a269661..0868bc09 100644
--- a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsListRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsRetrieveRequestRemoteFields.cs b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsRetrieveRequestRemoteFields.cs
index 8e71ed92..30ac88be 100644
--- a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsRetrieveRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsRetrieveRequestShowEnumOrigins.cs
index 125230b6..50876b83 100644
--- a/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Hris/PayrollRuns/Types/PayrollRunsRetrieveRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/RegenerateKey/RegenerateKeyClient.cs b/src/Merge.Client/Hris/RegenerateKey/RegenerateKeyClient.cs
index 9ed15ae1..18dae586 100644
--- a/src/Merge.Client/Hris/RegenerateKey/RegenerateKeyClient.cs
+++ b/src/Merge.Client/Hris/RegenerateKey/RegenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public RegenerateKeyClient(RawClient client)
     /// <summary>
     /// Exchange remote keys.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(RemoteKeyForRegenerationRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        RemoteKeyForRegenerationRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/regenerate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs b/src/Merge.Client/Hris/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
index 7176a7e0..0f949c65 100644
--- a/src/Merge.Client/Hris/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
+++ b/src/Merge.Client/Hris/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Hris;
 
-public class RemoteKeyForRegenerationRequest
+public record RemoteKeyForRegenerationRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Hris/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
index c4482720..def62b2c 100644
--- a/src/Merge.Client/Hris/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Hris/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class LinkedAccountCommonModelScopeDeserializerRequest
+public record LinkedAccountCommonModelScopeDeserializerRequest
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializerRequest>();
 }
diff --git a/src/Merge.Client/Hris/Scopes/ScopesClient.cs b/src/Merge.Client/Hris/Scopes/ScopesClient.cs
index ff362f99..51b20957 100644
--- a/src/Merge.Client/Hris/Scopes/ScopesClient.cs
+++ b/src/Merge.Client/Hris/Scopes/ScopesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,63 +18,110 @@ public ScopesClient(RawClient client)
     /// <summary>
     /// Get the default permissions for Merge Common Models and fields across all Linked Accounts of a given category. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/default-scopes"
+                Path = "hris/v1/default-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all available permissions for Merge Common Models and fields for a single Linked Account. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/linked-account-scopes"
+                Path = "hris/v1/linked-account-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Update permissions for any Common Model or field for a single Linked Account. Any Scopes not set in this POST request will inherit the default Scopes. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes)
     /// </summary>
     public async Task<CommonModelScopeApi> LinkedAccountScopesCreateAsync(
-        LinkedAccountCommonModelScopeDeserializerRequest request
+        LinkedAccountCommonModelScopeDeserializerRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/linked-account-scopes",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/SyncStatus/Requests/SyncStatusListRequest.cs b/src/Merge.Client/Hris/SyncStatus/Requests/SyncStatusListRequest.cs
index b3f49c5c..44418cc4 100644
--- a/src/Merge.Client/Hris/SyncStatus/Requests/SyncStatusListRequest.cs
+++ b/src/Merge.Client/Hris/SyncStatus/Requests/SyncStatusListRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Hris;
 
-public class SyncStatusListRequest
+public record SyncStatusListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Hris/SyncStatus/SyncStatusClient.cs b/src/Merge.Client/Hris/SyncStatus/SyncStatusClient.cs
index 5af0bd55..d2960036 100644
--- a/src/Merge.Client/Hris/SyncStatus/SyncStatusClient.cs
+++ b/src/Merge.Client/Hris/SyncStatus/SyncStatusClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public SyncStatusClient(RawClient client)
     /// <summary>
     /// Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `PARTIALLY_SYNCED`, `PAUSED`, `SYNCING`. Learn more about sync status in our [Help Center](https://help.merge.dev/en/articles/8184193-merge-sync-statuses).
     /// </summary>
-    public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest request)
+    public async Task<PaginatedSyncStatusList> ListAsync(
+        SyncStatusListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -32,16 +35,30 @@ public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest reque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/sync-status",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedSyncStatusList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedSyncStatusList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/Teams/Requests/TeamsListRequest.cs b/src/Merge.Client/Hris/Teams/Requests/TeamsListRequest.cs
index c26b6a4e..f27fc3bd 100644
--- a/src/Merge.Client/Hris/Teams/Requests/TeamsListRequest.cs
+++ b/src/Merge.Client/Hris/Teams/Requests/TeamsListRequest.cs
@@ -1,59 +1,59 @@
 namespace Merge.Client.Hris;
 
-public class TeamsListRequest
+public record TeamsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return teams with this parent team.
     /// </summary>
-    public string? ParentTeamId { get; init; }
+    public string? ParentTeamId { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Teams/Requests/TeamsRetrieveRequest.cs b/src/Merge.Client/Hris/Teams/Requests/TeamsRetrieveRequest.cs
index aa6ada45..f2ddb4c6 100644
--- a/src/Merge.Client/Hris/Teams/Requests/TeamsRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/Teams/Requests/TeamsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Hris;
 
-public class TeamsRetrieveRequest
+public record TeamsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Teams/TeamsClient.cs b/src/Merge.Client/Hris/Teams/TeamsClient.cs
index ba9eaa73..efad364c 100644
--- a/src/Merge.Client/Hris/Teams/TeamsClient.cs
+++ b/src/Merge.Client/Hris/Teams/TeamsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public TeamsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Team` objects.
     /// </summary>
-    public async Task<PaginatedTeamList> ListAsync(TeamsListRequest request)
+    public async Task<PaginatedTeamList> ListAsync(
+        TeamsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedTeamList> ListAsync(TeamsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -68,23 +77,41 @@ public async Task<PaginatedTeamList> ListAsync(TeamsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/teams",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTeamList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTeamList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Team` object with the given `id`.
     /// </summary>
-    public async Task<Team> RetrieveAsync(string id, TeamsRetrieveRequest request)
+    public async Task<Team> RetrieveAsync(
+        string id,
+        TeamsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -98,16 +125,30 @@ public async Task<Team> RetrieveAsync(string id, TeamsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/teams/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Team>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Team>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/TimeOff/Requests/TimeOffEndpointRequest.cs b/src/Merge.Client/Hris/TimeOff/Requests/TimeOffEndpointRequest.cs
index 0d7b2abd..34ca3366 100644
--- a/src/Merge.Client/Hris/TimeOff/Requests/TimeOffEndpointRequest.cs
+++ b/src/Merge.Client/Hris/TimeOff/Requests/TimeOffEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class TimeOffEndpointRequest
+public record TimeOffEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public TimeOffRequest Model { get; init; }
+    public required TimeOffRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Hris/TimeOff/Requests/TimeOffListRequest.cs b/src/Merge.Client/Hris/TimeOff/Requests/TimeOffListRequest.cs
index dc83d724..2a957943 100644
--- a/src/Merge.Client/Hris/TimeOff/Requests/TimeOffListRequest.cs
+++ b/src/Merge.Client/Hris/TimeOff/Requests/TimeOffListRequest.cs
@@ -1,85 +1,81 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class TimeOffListRequest
+public record TimeOffListRequest
 {
     /// <summary>
     /// If provided, will only return time off for this approver.
     /// </summary>
-    public string? ApproverId { get; init; }
+    public string? ApproverId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return time off for this employee.
     /// </summary>
-    public string? EmployeeId { get; init; }
+    public string? EmployeeId { get; set; }
 
     /// <summary>
     /// If provided, will only return employees that ended after this datetime.
     /// </summary>
-    public DateTime? EndedAfter { get; init; }
+    public DateTime? EndedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return time-offs that ended before this datetime.
     /// </summary>
-    public DateTime? EndedBefore { get; init; }
+    public DateTime? EndedBefore { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TimeOffListRequestExpand? Expand { get; init; }
+    public TimeOffListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public TimeOffListRequestRemoteFields? RemoteFields { get; init; }
+    public TimeOffListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return TimeOff with this request type. Options: ('VACATION', 'SICK', 'PERSONAL', 'JURY_DUTY', 'VOLUNTEER', 'BEREAVEMENT')
@@ -91,22 +87,22 @@ public class TimeOffListRequest
     /// - `VOLUNTEER` - VOLUNTEER
     /// - `BEREAVEMENT` - BEREAVEMENT
     /// </summary>
-    public TimeOffListRequestRequestType? RequestType { get; init; }
+    public TimeOffListRequestRequestType? RequestType { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public TimeOffListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public TimeOffListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return time-offs that started after this datetime.
     /// </summary>
-    public DateTime? StartedAfter { get; init; }
+    public DateTime? StartedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return time-offs that started before this datetime.
     /// </summary>
-    public DateTime? StartedBefore { get; init; }
+    public DateTime? StartedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return TimeOff with this status. Options: ('REQUESTED', 'APPROVED', 'DECLINED', 'CANCELLED', 'DELETED')
@@ -117,5 +113,5 @@ public class TimeOffListRequest
     /// - `CANCELLED` - CANCELLED
     /// - `DELETED` - DELETED
     /// </summary>
-    public TimeOffListRequestStatus? Status { get; init; }
+    public TimeOffListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Hris/TimeOff/Requests/TimeOffRetrieveRequest.cs b/src/Merge.Client/Hris/TimeOff/Requests/TimeOffRetrieveRequest.cs
index b98a0690..fe5b86b6 100644
--- a/src/Merge.Client/Hris/TimeOff/Requests/TimeOffRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/TimeOff/Requests/TimeOffRetrieveRequest.cs
@@ -1,28 +1,24 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class TimeOffRetrieveRequest
+public record TimeOffRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TimeOffRetrieveRequestExpand? Expand { get; init; }
+    public TimeOffRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public TimeOffRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public TimeOffRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public TimeOffRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public TimeOffRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/TimeOff/TimeOffClient.cs b/src/Merge.Client/Hris/TimeOff/TimeOffClient.cs
index 7a2fe644..2d477fb2 100644
--- a/src/Merge.Client/Hris/TimeOff/TimeOffClient.cs
+++ b/src/Merge.Client/Hris/TimeOff/TimeOffClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public TimeOffClient(RawClient client)
     /// <summary>
     /// Returns a list of `TimeOff` objects.
     /// </summary>
-    public async Task<PaginatedTimeOffList> ListAsync(TimeOffListRequest request)
+    public async Task<PaginatedTimeOffList> ListAsync(
+        TimeOffListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.ApproverId != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedTimeOffList> ListAsync(TimeOffListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,11 @@ public async Task<PaginatedTimeOffList> ListAsync(TimeOffListRequest request)
         }
         if (request.EndedAfter != null)
         {
-            _query["ended_after"] = request.EndedAfter.Value.ToString("o0");
+            _query["ended_after"] = request.EndedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.EndedBefore != null)
         {
-            _query["ended_before"] = request.EndedBefore.Value.ToString("o0");
+            _query["ended_before"] = request.EndedBefore.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.Expand != null)
         {
@@ -63,11 +68,15 @@ public async Task<PaginatedTimeOffList> ListAsync(TimeOffListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -91,11 +100,13 @@ public async Task<PaginatedTimeOffList> ListAsync(TimeOffListRequest request)
         }
         if (request.StartedAfter != null)
         {
-            _query["started_after"] = request.StartedAfter.Value.ToString("o0");
+            _query["started_after"] = request.StartedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.StartedBefore != null)
         {
-            _query["started_before"] = request.StartedBefore.Value.ToString("o0");
+            _query["started_before"] = request.StartedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Status != null)
         {
@@ -104,23 +115,40 @@ public async Task<PaginatedTimeOffList> ListAsync(TimeOffListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/time-off",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTimeOffList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTimeOffList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `TimeOff` object with the given values.
     /// </summary>
-    public async Task<TimeOffResponse> CreateAsync(TimeOffEndpointRequest request)
+    public async Task<TimeOffResponse> CreateAsync(
+        TimeOffEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -134,23 +162,41 @@ public async Task<TimeOffResponse> CreateAsync(TimeOffEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/time-off",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TimeOffResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TimeOffResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `TimeOff` object with the given `id`.
     /// </summary>
-    public async Task<TimeOff> RetrieveAsync(string id, TimeOffRetrieveRequest request)
+    public async Task<TimeOff> RetrieveAsync(
+        string id,
+        TimeOffRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -172,36 +218,64 @@ public async Task<TimeOff> RetrieveAsync(string id, TimeOffRetrieveRequest reque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/time-off/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TimeOff>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TimeOff>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `TimeOff` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/time-off/meta/post"
+                Path = "hris/v1/time-off/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestExpand.cs b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestExpand.cs
index 60bb69cf..9023b441 100644
--- a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestExpand.cs
+++ b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestRemoteFields.cs b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestRemoteFields.cs
index 6607d014..98348228 100644
--- a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestRemoteFields.cs
+++ b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestRequestType.cs b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestRequestType.cs
index 39875182..8859c5b7 100644
--- a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestRequestType.cs
+++ b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestRequestType.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestShowEnumOrigins.cs b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestShowEnumOrigins.cs
index cb358dd8..d6023861 100644
--- a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestStatus.cs b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestStatus.cs
index 6f633bb6..986e84a9 100644
--- a/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestStatus.cs
+++ b/src/Merge.Client/Hris/TimeOff/Types/TimeOffListRequestStatus.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestExpand.cs b/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestExpand.cs
index 1971ba7b..2c8b56bb 100644
--- a/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestRemoteFields.cs b/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestRemoteFields.cs
index 69a0acc9..a4b56043 100644
--- a/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestShowEnumOrigins.cs
index 185136f6..bdb6bb45 100644
--- a/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Hris/TimeOff/Types/TimeOffRetrieveRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimeOffBalances/Requests/TimeOffBalancesListRequest.cs b/src/Merge.Client/Hris/TimeOffBalances/Requests/TimeOffBalancesListRequest.cs
index 755283bd..9681d640 100644
--- a/src/Merge.Client/Hris/TimeOffBalances/Requests/TimeOffBalancesListRequest.cs
+++ b/src/Merge.Client/Hris/TimeOffBalances/Requests/TimeOffBalancesListRequest.cs
@@ -1,60 +1,56 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class TimeOffBalancesListRequest
+public record TimeOffBalancesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return time off balances for this employee.
     /// </summary>
-    public string? EmployeeId { get; init; }
+    public string? EmployeeId { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return TimeOffBalance with this policy type. Options: ('VACATION', 'SICK', 'PERSONAL', 'JURY_DUTY', 'VOLUNTEER', 'BEREAVEMENT')
@@ -66,20 +62,20 @@ public class TimeOffBalancesListRequest
     /// - `VOLUNTEER` - VOLUNTEER
     /// - `BEREAVEMENT` - BEREAVEMENT
     /// </summary>
-    public TimeOffBalancesListRequestPolicyType? PolicyType { get; init; }
+    public TimeOffBalancesListRequestPolicyType? PolicyType { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/TimeOffBalances/Requests/TimeOffBalancesRetrieveRequest.cs b/src/Merge.Client/Hris/TimeOffBalances/Requests/TimeOffBalancesRetrieveRequest.cs
index 2f67f4bf..ddc791f1 100644
--- a/src/Merge.Client/Hris/TimeOffBalances/Requests/TimeOffBalancesRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/TimeOffBalances/Requests/TimeOffBalancesRetrieveRequest.cs
@@ -1,24 +1,24 @@
 namespace Merge.Client.Hris;
 
-public class TimeOffBalancesRetrieveRequest
+public record TimeOffBalancesRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Hris/TimeOffBalances/TimeOffBalancesClient.cs b/src/Merge.Client/Hris/TimeOffBalances/TimeOffBalancesClient.cs
index 2f0c383c..90db31c5 100644
--- a/src/Merge.Client/Hris/TimeOffBalances/TimeOffBalancesClient.cs
+++ b/src/Merge.Client/Hris/TimeOffBalances/TimeOffBalancesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public TimeOffBalancesClient(RawClient client)
     /// <summary>
     /// Returns a list of `TimeOffBalance` objects.
     /// </summary>
-    public async Task<PaginatedTimeOffBalanceList> ListAsync(TimeOffBalancesListRequest request)
+    public async Task<PaginatedTimeOffBalanceList> ListAsync(
+        TimeOffBalancesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedTimeOffBalanceList> ListAsync(TimeOffBalancesListRequ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -80,17 +89,31 @@ public async Task<PaginatedTimeOffBalanceList> ListAsync(TimeOffBalancesListRequ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/time-off-balances",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTimeOffBalanceList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTimeOffBalanceList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -98,7 +121,8 @@ public async Task<PaginatedTimeOffBalanceList> ListAsync(TimeOffBalancesListRequ
     /// </summary>
     public async Task<TimeOffBalance> RetrieveAsync(
         string id,
-        TimeOffBalancesRetrieveRequest request
+        TimeOffBalancesRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -121,16 +145,30 @@ TimeOffBalancesRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/time-off-balances/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TimeOffBalance>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TimeOffBalance>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/TimeOffBalances/Types/TimeOffBalancesListRequestPolicyType.cs b/src/Merge.Client/Hris/TimeOffBalances/Types/TimeOffBalancesListRequestPolicyType.cs
index fe886071..2b300a96 100644
--- a/src/Merge.Client/Hris/TimeOffBalances/Types/TimeOffBalancesListRequestPolicyType.cs
+++ b/src/Merge.Client/Hris/TimeOffBalances/Types/TimeOffBalancesListRequestPolicyType.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntriesListRequest.cs b/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntriesListRequest.cs
index f0033472..76619ce2 100644
--- a/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntriesListRequest.cs
+++ b/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntriesListRequest.cs
@@ -1,83 +1,79 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class TimesheetEntriesListRequest
+public record TimesheetEntriesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return timesheet entries for this employee.
     /// </summary>
-    public string? EmployeeId { get; init; }
+    public string? EmployeeId { get; set; }
 
     /// <summary>
     /// If provided, will only return timesheet entries ended after this datetime.
     /// </summary>
-    public string? EndedAfter { get; init; }
+    public string? EndedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return timesheet entries ended before this datetime.
     /// </summary>
-    public string? EndedBefore { get; init; }
+    public string? EndedBefore { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Overrides the default ordering for this endpoint. Possible values include: start_time, -start_time.
     /// </summary>
-    public TimesheetEntriesListRequestOrderBy? OrderBy { get; init; }
+    public TimesheetEntriesListRequestOrderBy? OrderBy { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return timesheet entries started after this datetime.
     /// </summary>
-    public string? StartedAfter { get; init; }
+    public string? StartedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return timesheet entries started before this datetime.
     /// </summary>
-    public string? StartedBefore { get; init; }
+    public string? StartedBefore { get; set; }
 }
diff --git a/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntriesRetrieveRequest.cs b/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntriesRetrieveRequest.cs
index 9031bdec..c29aeea0 100644
--- a/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntriesRetrieveRequest.cs
+++ b/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntriesRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Hris;
 
-public class TimesheetEntriesRetrieveRequest
+public record TimesheetEntriesRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntryEndpointRequest.cs b/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntryEndpointRequest.cs
index 2dc1c799..bacc47e8 100644
--- a/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntryEndpointRequest.cs
+++ b/src/Merge.Client/Hris/TimesheetEntries/Requests/TimesheetEntryEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Hris;
-
-#nullable enable
-
 namespace Merge.Client.Hris;
 
-public class TimesheetEntryEndpointRequest
+public record TimesheetEntryEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public TimesheetEntryRequest Model { get; init; }
+    public required TimesheetEntryRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Hris/TimesheetEntries/TimesheetEntriesClient.cs b/src/Merge.Client/Hris/TimesheetEntries/TimesheetEntriesClient.cs
index ad148af7..0631bb57 100644
--- a/src/Merge.Client/Hris/TimesheetEntries/TimesheetEntriesClient.cs
+++ b/src/Merge.Client/Hris/TimesheetEntries/TimesheetEntriesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public TimesheetEntriesClient(RawClient client)
     /// <summary>
     /// Returns a list of `TimesheetEntry` objects.
     /// </summary>
-    public async Task<PaginatedTimesheetEntryList> ListAsync(TimesheetEntriesListRequest request)
+    public async Task<PaginatedTimesheetEntryList> ListAsync(
+        TimesheetEntriesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -55,11 +60,15 @@ public async Task<PaginatedTimesheetEntryList> ListAsync(TimesheetEntriesListReq
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.OrderBy != null)
         {
@@ -84,23 +93,40 @@ public async Task<PaginatedTimesheetEntryList> ListAsync(TimesheetEntriesListReq
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "hris/v1/timesheet-entries",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTimesheetEntryList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTimesheetEntryList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `TimesheetEntry` object with the given values.
     /// </summary>
-    public async Task<TimesheetEntryResponse> CreateAsync(TimesheetEntryEndpointRequest request)
+    public async Task<TimesheetEntryResponse> CreateAsync(
+        TimesheetEntryEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -114,17 +140,31 @@ public async Task<TimesheetEntryResponse> CreateAsync(TimesheetEntryEndpointRequ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/timesheet-entries",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TimesheetEntryResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TimesheetEntryResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -132,7 +172,8 @@ public async Task<TimesheetEntryResponse> CreateAsync(TimesheetEntryEndpointRequ
     /// </summary>
     public async Task<TimesheetEntry> RetrieveAsync(
         string id,
-        TimesheetEntriesRetrieveRequest request
+        TimesheetEntriesRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -143,36 +184,64 @@ TimesheetEntriesRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"hris/v1/timesheet-entries/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TimesheetEntry>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TimesheetEntry>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `TimesheetEntry` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/timesheet-entries/meta/post"
+                Path = "hris/v1/timesheet-entries/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Hris/TimesheetEntries/Types/TimesheetEntriesListRequestOrderBy.cs b/src/Merge.Client/Hris/TimesheetEntries/Types/TimesheetEntriesListRequestOrderBy.cs
index 8f613a95..bcdd522b 100644
--- a/src/Merge.Client/Hris/TimesheetEntries/Types/TimesheetEntriesListRequestOrderBy.cs
+++ b/src/Merge.Client/Hris/TimesheetEntries/Types/TimesheetEntriesListRequestOrderBy.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/AccountDetails.cs b/src/Merge.Client/Hris/Types/AccountDetails.cs
index f4ecdf4b..78114d5a 100644
--- a/src/Merge.Client/Hris/Types/AccountDetails.cs
+++ b/src/Merge.Client/Hris/Types/AccountDetails.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class AccountDetails
+public record AccountDetails
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     [JsonPropertyName("integration_slug")]
-    public string? IntegrationSlug { get; init; }
+    public string? IntegrationSlug { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     [JsonPropertyName("status")]
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string? WebhookListenerUrl { get; init; }
+    public string? WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string? AccountType { get; init; }
+    public string? AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/AccountDetailsAndActions.cs b/src/Merge.Client/Hris/Types/AccountDetailsAndActions.cs
index c15c9b85..daa3882c 100644
--- a/src/Merge.Client/Hris/Types/AccountDetailsAndActions.cs
+++ b/src/Merge.Client/Hris/Types/AccountDetailsAndActions.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class AccountDetailsAndActions
+public record AccountDetailsAndActions
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("status")]
-    public AccountDetailsAndActionsStatusEnum Status { get; init; }
+    public required AccountDetailsAndActionsStatusEnum Status { get; set; }
 
     [JsonPropertyName("status_detail")]
-    public string? StatusDetail { get; init; }
+    public string? StatusDetail { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// The tenant or domain the customer has provided access to.
     /// </summary>
     [JsonPropertyName("subdomain")]
-    public string? Subdomain { get; init; }
+    public string? Subdomain { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string WebhookListenerUrl { get; init; }
+    public required string WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountDetailsAndActionsIntegration? Integration { get; init; }
+    public AccountDetailsAndActionsIntegration? Integration { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string AccountType { get; init; }
+    public required string AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/AccountDetailsAndActionsIntegration.cs b/src/Merge.Client/Hris/Types/AccountDetailsAndActionsIntegration.cs
index 54380838..fc0f19f5 100644
--- a/src/Merge.Client/Hris/Types/AccountDetailsAndActionsIntegration.cs
+++ b/src/Merge.Client/Hris/Types/AccountDetailsAndActionsIntegration.cs
@@ -1,33 +1,32 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class AccountDetailsAndActionsIntegration
+public record AccountDetailsAndActionsIntegration
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     [JsonPropertyName("color")]
-    public string Color { get; init; }
+    public required string Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string Slug { get; init; }
+    public required string Slug { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/AccountDetailsAndActionsStatusEnum.cs b/src/Merge.Client/Hris/Types/AccountDetailsAndActionsStatusEnum.cs
index d4056df0..4d215a5a 100644
--- a/src/Merge.Client/Hris/Types/AccountDetailsAndActionsStatusEnum.cs
+++ b/src/Merge.Client/Hris/Types/AccountDetailsAndActionsStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/AccountIntegration.cs b/src/Merge.Client/Hris/Types/AccountIntegration.cs
index 4f7e2461..571bc292 100644
--- a/src/Merge.Client/Hris/Types/AccountIntegration.cs
+++ b/src/Merge.Client/Hris/Types/AccountIntegration.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class AccountIntegration
+public record AccountIntegration
 {
     /// <summary>
     /// Company name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// Optional. This shortened name appears in places with limited space, usually in conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example: <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP SuccessFactors)</i>
     /// </summary>
     [JsonPropertyName("abbreviated_name")]
-    public string? AbbreviatedName { get; init; }
+    public string? AbbreviatedName { get; set; }
 
     /// <summary>
     /// Category or categories this integration belongs to. Multiple categories should be comma separated, i.e. [ats, hris].
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum>? Categories { get; init; }
+    public IEnumerable<CategoriesEnum>? Categories { get; set; }
 
     /// <summary>
     /// Company logo in rectangular shape. <b>Upload an image with a clear background.</b>
     /// </summary>
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     /// <summary>
     /// Company logo in square shape. <b>Upload an image with a white background.</b>
     /// </summary>
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     /// <summary>
     /// The color of this integration used for buttons and text throughout the app and landing pages. <b>Choose a darker, saturated color.</b>
     /// </summary>
     [JsonPropertyName("color")]
-    public string? Color { get; init; }
+    public string? Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string? Slug { get; init; }
+    public string? Slug { get; set; }
 
     /// <summary>
     /// Mapping of API endpoints to documentation urls for support. Example: {'GET': [['/common-model-scopes', 'https://docs.merge.dev/accounting/common-model-scopes/#common_model_scopes_retrieve'],['/common-model-actions', 'https://docs.merge.dev/accounting/common-model-actions/#common_model_actions_retrieve']], 'POST': []}
     /// </summary>
     [JsonPropertyName("api_endpoints_to_documentation_urls")]
-    public Dictionary<string, object>? ApiEndpointsToDocumentationUrls { get; init; }
+    public Dictionary<string, object?>? ApiEndpointsToDocumentationUrls { get; set; }
 
     /// <summary>
     /// Setup guide URL for third party webhook creation. Exposed in Merge Docs.
     /// </summary>
     [JsonPropertyName("webhook_setup_guide_url")]
-    public string? WebhookSetupGuideUrl { get; init; }
+    public string? WebhookSetupGuideUrl { get; set; }
 
     /// <summary>
     /// Category or categories this integration is in beta status for.
     /// </summary>
     [JsonPropertyName("category_beta_status")]
-    public Dictionary<string, object>? CategoryBetaStatus { get; init; }
+    public Dictionary<string, object?>? CategoryBetaStatus { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/AccountToken.cs b/src/Merge.Client/Hris/Types/AccountToken.cs
index 0900db92..823e101c 100644
--- a/src/Merge.Client/Hris/Types/AccountToken.cs
+++ b/src/Merge.Client/Hris/Types/AccountToken.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class AccountToken
+public record AccountToken
 {
     [JsonPropertyName("account_token")]
-    public string AccountToken_ { get; init; }
+    public required string AccountToken_ { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/AccountTypeEnum.cs b/src/Merge.Client/Hris/Types/AccountTypeEnum.cs
index 137d2556..e9406566 100644
--- a/src/Merge.Client/Hris/Types/AccountTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/AccountTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/AdvancedMetadata.cs b/src/Merge.Client/Hris/Types/AdvancedMetadata.cs
index 813cf505..68c37276 100644
--- a/src/Merge.Client/Hris/Types/AdvancedMetadata.cs
+++ b/src/Merge.Client/Hris/Types/AdvancedMetadata.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Hris;
 
-public class AdvancedMetadata
+public record AdvancedMetadata
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("is_custom")]
-    public bool? IsCustom { get; init; }
+    public bool? IsCustom { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<object>? FieldChoices { get; init; }
+    public IEnumerable<object>? FieldChoices { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/AsyncPassthroughReciept.cs b/src/Merge.Client/Hris/Types/AsyncPassthroughReciept.cs
index 2947f020..c4082b85 100644
--- a/src/Merge.Client/Hris/Types/AsyncPassthroughReciept.cs
+++ b/src/Merge.Client/Hris/Types/AsyncPassthroughReciept.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Hris;
 
-public class AsyncPassthroughReciept
+public record AsyncPassthroughReciept
 {
     [JsonPropertyName("async_passthrough_receipt_id")]
-    public string AsyncPassthroughReceiptId { get; init; }
+    public required string AsyncPassthroughReceiptId { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/AuditLogEvent.cs b/src/Merge.Client/Hris/Types/AuditLogEvent.cs
index 0a9b37ea..f6117f10 100644
--- a/src/Merge.Client/Hris/Types/AuditLogEvent.cs
+++ b/src/Merge.Client/Hris/Types/AuditLogEvent.cs
@@ -1,26 +1,25 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class AuditLogEvent
+public record AuditLogEvent
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The User's full name at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_name")]
-    public string? UserName { get; init; }
+    public string? UserName { get; set; }
 
     /// <summary>
     /// The User's email at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_email")]
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 
     /// <summary>
     /// Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.
@@ -33,10 +32,10 @@ public class AuditLogEvent
     /// - `MERGE_TEAM` - MERGE_TEAM
     /// </summary>
     [JsonPropertyName("role")]
-    public RoleEnum Role { get; init; }
+    public required RoleEnum Role { get; set; }
 
     [JsonPropertyName("ip_address")]
-    public string IpAddress { get; init; }
+    public required string IpAddress { get; set; }
 
     /// <summary>
     /// Designates the type of event that occurred.
@@ -81,11 +80,11 @@ public class AuditLogEvent
     /// - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
     /// </summary>
     [JsonPropertyName("event_type")]
-    public EventTypeEnum EventType { get; init; }
+    public required EventTypeEnum EventType { get; set; }
 
     [JsonPropertyName("event_description")]
-    public string EventDescription { get; init; }
+    public required string EventDescription { get; set; }
 
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/AvailableActions.cs b/src/Merge.Client/Hris/Types/AvailableActions.cs
index 0dc6e643..c46c8f1f 100644
--- a/src/Merge.Client/Hris/Types/AvailableActions.cs
+++ b/src/Merge.Client/Hris/Types/AvailableActions.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class AvailableActions
+public record AvailableActions
 {
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/BankInfo.cs b/src/Merge.Client/Hris/Types/BankInfo.cs
index 9b66c254..f9ecb58b 100644
--- a/src/Merge.Client/Hris/Types/BankInfo.cs
+++ b/src/Merge.Client/Hris/Types/BankInfo.cs
@@ -1,59 +1,58 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class BankInfo
+public record BankInfo
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The employee with this bank account.
     /// </summary>
     [JsonPropertyName("employee")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Employee { get; init; }
+    public OneOf<string, Employee>? Employee { get; set; }
 
     /// <summary>
     /// The account number.
     /// </summary>
     [JsonPropertyName("account_number")]
-    public string? AccountNumber { get; init; }
+    public string? AccountNumber { get; set; }
 
     /// <summary>
     /// The routing number.
     /// </summary>
     [JsonPropertyName("routing_number")]
-    public string? RoutingNumber { get; init; }
+    public string? RoutingNumber { get; set; }
 
     /// <summary>
     /// The bank name.
     /// </summary>
     [JsonPropertyName("bank_name")]
-    public string? BankName { get; init; }
+    public string? BankName { get; set; }
 
     /// <summary>
     /// The bank account type
@@ -62,23 +61,23 @@ public class BankInfo
     /// - `CHECKING` - CHECKING
     /// </summary>
     [JsonPropertyName("account_type")]
-    public AccountTypeEnum? AccountType { get; init; }
+    public AccountTypeEnum? AccountType { get; set; }
 
     /// <summary>
     /// When the matching bank object was created in the third party system.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/Benefit.cs b/src/Merge.Client/Hris/Types/Benefit.cs
index 13f7804a..8a7c5cac 100644
--- a/src/Merge.Client/Hris/Types/Benefit.cs
+++ b/src/Merge.Client/Hris/Types/Benefit.cs
@@ -1,93 +1,92 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Benefit
+public record Benefit
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The employee on the plan.
     /// </summary>
     [JsonPropertyName("employee")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Employee { get; init; }
+    public OneOf<string, Employee>? Employee { get; set; }
 
     /// <summary>
     /// The name of the benefit provider.
     /// </summary>
     [JsonPropertyName("provider_name")]
-    public string? ProviderName { get; init; }
+    public string? ProviderName { get; set; }
 
     /// <summary>
     /// The type of benefit plan
     /// </summary>
     [JsonPropertyName("benefit_plan_type")]
-    public string? BenefitPlanType { get; init; }
+    public string? BenefitPlanType { get; set; }
 
     /// <summary>
     /// The employee's contribution.
     /// </summary>
     [JsonPropertyName("employee_contribution")]
-    public double? EmployeeContribution { get; init; }
+    public double? EmployeeContribution { get; set; }
 
     /// <summary>
     /// The company's contribution.
     /// </summary>
     [JsonPropertyName("company_contribution")]
-    public double? CompanyContribution { get; init; }
+    public double? CompanyContribution { get; set; }
 
     /// <summary>
     /// The day and time the benefit started.
     /// </summary>
     [JsonPropertyName("start_date")]
-    public DateTime? StartDate { get; init; }
+    public DateTime? StartDate { get; set; }
 
     /// <summary>
     /// The day and time the benefit ended.
     /// </summary>
     [JsonPropertyName("end_date")]
-    public DateTime? EndDate { get; init; }
+    public DateTime? EndDate { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The employer benefit plan the employee is enrolled in.
     /// </summary>
     [JsonPropertyName("employer_benefit")]
-    public string? EmployerBenefit { get; init; }
+    public string? EmployerBenefit { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/BenefitPlanTypeEnum.cs b/src/Merge.Client/Hris/Types/BenefitPlanTypeEnum.cs
index fe74683e..9185ae91 100644
--- a/src/Merge.Client/Hris/Types/BenefitPlanTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/BenefitPlanTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/CategoriesEnum.cs b/src/Merge.Client/Hris/Types/CategoriesEnum.cs
index b534f4a1..a09d288f 100644
--- a/src/Merge.Client/Hris/Types/CategoriesEnum.cs
+++ b/src/Merge.Client/Hris/Types/CategoriesEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/CategoryEnum.cs b/src/Merge.Client/Hris/Types/CategoryEnum.cs
index b3e98121..7f4c7865 100644
--- a/src/Merge.Client/Hris/Types/CategoryEnum.cs
+++ b/src/Merge.Client/Hris/Types/CategoryEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/CommonModelScopeApi.cs b/src/Merge.Client/Hris/Types/CommonModelScopeApi.cs
index 85503f41..2577f111 100644
--- a/src/Merge.Client/Hris/Types/CommonModelScopeApi.cs
+++ b/src/Merge.Client/Hris/Types/CommonModelScopeApi.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class CommonModelScopeApi
+public record CommonModelScopeApi
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializer>();
 }
diff --git a/src/Merge.Client/Hris/Types/CommonModelScopesBodyRequest.cs b/src/Merge.Client/Hris/Types/CommonModelScopesBodyRequest.cs
index 679324a3..037556e0 100644
--- a/src/Merge.Client/Hris/Types/CommonModelScopesBodyRequest.cs
+++ b/src/Merge.Client/Hris/Types/CommonModelScopesBodyRequest.cs
@@ -1,18 +1,18 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class CommonModelScopesBodyRequest
+public record CommonModelScopesBodyRequest
 {
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("enabled_actions")]
-    public IEnumerable<EnabledActionsEnum> EnabledActions { get; init; }
+    public IEnumerable<EnabledActionsEnum> EnabledActions { get; set; } =
+        new List<EnabledActionsEnum>();
 
     [JsonPropertyName("disabled_fields")]
-    public IEnumerable<string> DisabledFields { get; init; }
+    public IEnumerable<string> DisabledFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Hris/Types/Company.cs b/src/Merge.Client/Hris/Types/Company.cs
index 760f48cd..d5e2c20d 100644
--- a/src/Merge.Client/Hris/Types/Company.cs
+++ b/src/Merge.Client/Hris/Types/Company.cs
@@ -1,60 +1,59 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Company
+public record Company
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The company's legal name.
     /// </summary>
     [JsonPropertyName("legal_name")]
-    public string? LegalName { get; init; }
+    public string? LegalName { get; set; }
 
     /// <summary>
     /// The company's display name.
     /// </summary>
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     /// <summary>
     /// The company's Employer Identification Numbers.
     /// </summary>
     [JsonPropertyName("eins")]
-    public IEnumerable<string>? Eins { get; init; }
+    public IEnumerable<string>? Eins { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/CountryEnum.cs b/src/Merge.Client/Hris/Types/CountryEnum.cs
index b1a73b9e..3eea5c95 100644
--- a/src/Merge.Client/Hris/Types/CountryEnum.cs
+++ b/src/Merge.Client/Hris/Types/CountryEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/DataPassthroughRequest.cs b/src/Merge.Client/Hris/Types/DataPassthroughRequest.cs
index 94725a4a..bc9c4ce3 100644
--- a/src/Merge.Client/Hris/Types/DataPassthroughRequest.cs
+++ b/src/Merge.Client/Hris/Types/DataPassthroughRequest.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class DataPassthroughRequest
+public record DataPassthroughRequest
 {
     [JsonPropertyName("method")]
-    public MethodEnum Method { get; init; }
+    public required MethodEnum Method { get; set; }
 
     /// <summary>
     /// The path of the request in the third party's platform.
     /// </summary>
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     /// <summary>
     /// An optional override of the third party's base url for the request.
     /// </summary>
     [JsonPropertyName("base_url_override")]
-    public string? BaseUrlOverride { get; init; }
+    public string? BaseUrlOverride { get; set; }
 
     /// <summary>
     /// The data with the request. You must include a `request_format` parameter matching the data's format
     /// </summary>
     [JsonPropertyName("data")]
-    public string? Data { get; init; }
+    public string? Data { get; set; }
 
     /// <summary>
     /// Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`.
     /// </summary>
     [JsonPropertyName("multipart_form_data")]
-    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; init; }
+    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; set; }
 
     /// <summary>
     /// The headers to use for the request (Merge will handle the account's authorization headers). `Content-Type` header is required for passthrough. Choose content type corresponding to expected format of receiving server.
     /// </summary>
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 
     [JsonPropertyName("request_format")]
-    public RequestFormatEnum? RequestFormat { get; init; }
+    public RequestFormatEnum? RequestFormat { get; set; }
 
     /// <summary>
     /// Optional. If true, the response will always be an object of the form `{"type": T, "value": ...}` where `T` will be one of `string, boolean, number, null, array, object`.
     /// </summary>
     [JsonPropertyName("normalize_response")]
-    public bool? NormalizeResponse { get; init; }
+    public bool? NormalizeResponse { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/DebugModeLog.cs b/src/Merge.Client/Hris/Types/DebugModeLog.cs
index 00d9fbe1..7a20eb18 100644
--- a/src/Merge.Client/Hris/Types/DebugModeLog.cs
+++ b/src/Merge.Client/Hris/Types/DebugModeLog.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class DebugModeLog
+public record DebugModeLog
 {
     [JsonPropertyName("log_id")]
-    public string LogId { get; init; }
+    public required string LogId { get; set; }
 
     [JsonPropertyName("dashboard_view")]
-    public string DashboardView { get; init; }
+    public required string DashboardView { get; set; }
 
     [JsonPropertyName("log_summary")]
-    public DebugModelLogSummary LogSummary { get; init; }
+    public required DebugModelLogSummary LogSummary { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/DebugModelLogSummary.cs b/src/Merge.Client/Hris/Types/DebugModelLogSummary.cs
index 8c696dc3..fde92116 100644
--- a/src/Merge.Client/Hris/Types/DebugModelLogSummary.cs
+++ b/src/Merge.Client/Hris/Types/DebugModelLogSummary.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Hris;
 
-public class DebugModelLogSummary
+public record DebugModelLogSummary
 {
     [JsonPropertyName("url")]
-    public string Url { get; init; }
+    public required string Url { get; set; }
 
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("status_code")]
-    public int StatusCode { get; init; }
+    public required int StatusCode { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/Deduction.cs b/src/Merge.Client/Hris/Types/Deduction.cs
index ae97d056..160e6239 100644
--- a/src/Merge.Client/Hris/Types/Deduction.cs
+++ b/src/Merge.Client/Hris/Types/Deduction.cs
@@ -1,63 +1,62 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Deduction
+public record Deduction
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("employee_payroll_run")]
-    public string? EmployeePayrollRun { get; init; }
+    public string? EmployeePayrollRun { get; set; }
 
     /// <summary>
     /// The deduction's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The amount of money that is withheld from an employee's gross pay by the employee.
     /// </summary>
     [JsonPropertyName("employee_deduction")]
-    public double? EmployeeDeduction { get; init; }
+    public double? EmployeeDeduction { get; set; }
 
     /// <summary>
     /// The amount of money that is withheld on behalf of an employee by the company.
     /// </summary>
     [JsonPropertyName("company_deduction")]
-    public double? CompanyDeduction { get; init; }
+    public double? CompanyDeduction { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/Dependent.cs b/src/Merge.Client/Hris/Types/Dependent.cs
index f8ebbded..5f3e10fc 100644
--- a/src/Merge.Client/Hris/Types/Dependent.cs
+++ b/src/Merge.Client/Hris/Types/Dependent.cs
@@ -1,50 +1,49 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Dependent
+public record Dependent
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The dependents's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The dependents's middle name.
     /// </summary>
     [JsonPropertyName("middle_name")]
-    public string? MiddleName { get; init; }
+    public string? MiddleName { get; set; }
 
     /// <summary>
     /// The dependents's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The dependent's relationship to the employee.
@@ -54,19 +53,19 @@ public class Dependent
     /// - `DOMESTIC_PARTNER` - DOMESTIC_PARTNER
     /// </summary>
     [JsonPropertyName("relationship")]
-    public RelationshipEnum? Relationship { get; init; }
+    public RelationshipEnum? Relationship { get; set; }
 
     /// <summary>
     /// The employee this person is a dependent of.
     /// </summary>
     [JsonPropertyName("employee")]
-    public string? Employee { get; init; }
+    public string? Employee { get; set; }
 
     /// <summary>
     /// The dependent's date of birth.
     /// </summary>
     [JsonPropertyName("date_of_birth")]
-    public DateTime? DateOfBirth { get; init; }
+    public DateTime? DateOfBirth { get; set; }
 
     /// <summary>
     /// The dependent's gender.
@@ -78,41 +77,41 @@ public class Dependent
     /// - `PREFER_NOT_TO_DISCLOSE` - PREFER_NOT_TO_DISCLOSE
     /// </summary>
     [JsonPropertyName("gender")]
-    public GenderEnum? Gender { get; init; }
+    public GenderEnum? Gender { get; set; }
 
     /// <summary>
     /// The dependent's phone number.
     /// </summary>
     [JsonPropertyName("phone_number")]
-    public string? PhoneNumber { get; init; }
+    public string? PhoneNumber { get; set; }
 
     /// <summary>
     /// The dependents's home address.
     /// </summary>
     [JsonPropertyName("home_location")]
-    public string? HomeLocation { get; init; }
+    public string? HomeLocation { get; set; }
 
     /// <summary>
     /// Whether or not the dependent is a student
     /// </summary>
     [JsonPropertyName("is_student")]
-    public bool? IsStudent { get; init; }
+    public bool? IsStudent { get; set; }
 
     /// <summary>
     /// The dependents's social security number.
     /// </summary>
     [JsonPropertyName("ssn")]
-    public string? Ssn { get; init; }
+    public string? Ssn { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/Earning.cs b/src/Merge.Client/Hris/Types/Earning.cs
index 1661daa6..936827f9 100644
--- a/src/Merge.Client/Hris/Types/Earning.cs
+++ b/src/Merge.Client/Hris/Types/Earning.cs
@@ -1,41 +1,40 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Earning
+public record Earning
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("employee_payroll_run")]
-    public string? EmployeePayrollRun { get; init; }
+    public string? EmployeePayrollRun { get; set; }
 
     /// <summary>
     /// The amount earned.
     /// </summary>
     [JsonPropertyName("amount")]
-    public double? Amount { get; init; }
+    public double? Amount { get; set; }
 
     /// <summary>
     /// The type of earning.
@@ -46,17 +45,17 @@ public class Earning
     /// - `BONUS` - BONUS
     /// </summary>
     [JsonPropertyName("type")]
-    public EarningTypeEnum? Type { get; init; }
+    public EarningTypeEnum? Type { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/EarningTypeEnum.cs b/src/Merge.Client/Hris/Types/EarningTypeEnum.cs
index 1b475872..6faae9e8 100644
--- a/src/Merge.Client/Hris/Types/EarningTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/EarningTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/Employee.cs b/src/Merge.Client/Hris/Types/Employee.cs
index 8bef3814..e4b86491 100644
--- a/src/Merge.Client/Hris/Types/Employee.cs
+++ b/src/Merge.Client/Hris/Types/Employee.cs
@@ -1,77 +1,76 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Employee
+public record Employee
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The employee's number that appears in the third-party integration's UI.
     /// </summary>
     [JsonPropertyName("employee_number")]
-    public string? EmployeeNumber { get; init; }
+    public string? EmployeeNumber { get; set; }
 
     /// <summary>
     /// The ID of the employee's company.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Company>>))]
-    public OneOf<string, Company>? Company { get; init; }
+    public OneOf<string, Company>? Company { get; set; }
 
     /// <summary>
     /// The employee's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The employee's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The employee's preferred first name.
     /// </summary>
     [JsonPropertyName("preferred_name")]
-    public string? PreferredName { get; init; }
+    public string? PreferredName { get; set; }
 
     /// <summary>
     /// The employee's full name, to use for display purposes. If a preferred first name is available, the full name will include the preferred first name.
     /// </summary>
     [JsonPropertyName("display_full_name")]
-    public string? DisplayFullName { get; init; }
+    public string? DisplayFullName { get; set; }
 
     /// <summary>
     /// The employee's username that appears in the remote UI.
     /// </summary>
     [JsonPropertyName("username")]
-    public string? Username { get; init; }
+    public string? Username { get; set; }
 
     [JsonPropertyName("groups")]
     [JsonConverter(
@@ -80,25 +79,25 @@ public class Employee
             OneOfSerializer<OneOf<string, Group>>
         >)
     )]
-    public IEnumerable<OneOf<string, Group>>? Groups { get; init; }
+    public IEnumerable<OneOf<string, Group>>? Groups { get; set; }
 
     /// <summary>
     /// The employee's work email.
     /// </summary>
     [JsonPropertyName("work_email")]
-    public string? WorkEmail { get; init; }
+    public string? WorkEmail { get; set; }
 
     /// <summary>
     /// The employee's personal email.
     /// </summary>
     [JsonPropertyName("personal_email")]
-    public string? PersonalEmail { get; init; }
+    public string? PersonalEmail { get; set; }
 
     /// <summary>
     /// The employee's mobile phone number.
     /// </summary>
     [JsonPropertyName("mobile_phone_number")]
-    public string? MobilePhoneNumber { get; init; }
+    public string? MobilePhoneNumber { get; set; }
 
     /// <summary>
     /// Array of `Employment` IDs for this Employee.
@@ -110,48 +109,48 @@ public class Employee
             OneOfSerializer<OneOf<string, Employment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Employment>>? Employments { get; init; }
+    public IEnumerable<OneOf<string, Employment>>? Employments { get; set; }
 
     /// <summary>
     /// The employee's home address.
     /// </summary>
     [JsonPropertyName("home_location")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Location>>))]
-    public OneOf<string, Location>? HomeLocation { get; init; }
+    public OneOf<string, Location>? HomeLocation { get; set; }
 
     /// <summary>
     /// The employee's work address.
     /// </summary>
     [JsonPropertyName("work_location")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Location>>))]
-    public OneOf<string, Location>? WorkLocation { get; init; }
+    public OneOf<string, Location>? WorkLocation { get; set; }
 
     /// <summary>
     /// The employee ID of the employee's manager.
     /// </summary>
     [JsonPropertyName("manager")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Manager { get; init; }
+    public OneOf<string, Employee>? Manager { get; set; }
 
     /// <summary>
     /// The employee's team.
     /// </summary>
     [JsonPropertyName("team")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Team>>))]
-    public OneOf<string, Team>? Team { get; init; }
+    public OneOf<string, Team>? Team { get; set; }
 
     /// <summary>
     /// The employee's pay group
     /// </summary>
     [JsonPropertyName("pay_group")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, PayGroup>>))]
-    public OneOf<string, PayGroup>? PayGroup { get; init; }
+    public OneOf<string, PayGroup>? PayGroup { get; set; }
 
     /// <summary>
     /// The employee's social security number.
     /// </summary>
     [JsonPropertyName("ssn")]
-    public string? Ssn { get; init; }
+    public string? Ssn { get; set; }
 
     /// <summary>
     /// The employee's gender.
@@ -163,7 +162,7 @@ public class Employee
     /// - `PREFER_NOT_TO_DISCLOSE` - PREFER_NOT_TO_DISCLOSE
     /// </summary>
     [JsonPropertyName("gender")]
-    public GenderEnum? Gender { get; init; }
+    public GenderEnum? Gender { get; set; }
 
     /// <summary>
     /// The employee's ethnicity.
@@ -178,7 +177,7 @@ public class Employee
     /// - `PREFER_NOT_TO_DISCLOSE` - PREFER_NOT_TO_DISCLOSE
     /// </summary>
     [JsonPropertyName("ethnicity")]
-    public EthnicityEnum? Ethnicity { get; init; }
+    public EthnicityEnum? Ethnicity { get; set; }
 
     /// <summary>
     /// The employee's filing status as related to marital status.
@@ -190,31 +189,31 @@ public class Employee
     /// - `QUALIFYING_WIDOW_OR_WIDOWER_WITH_DEPENDENT_CHILD` - QUALIFYING_WIDOW_OR_WIDOWER_WITH_DEPENDENT_CHILD
     /// </summary>
     [JsonPropertyName("marital_status")]
-    public MaritalStatusEnum? MaritalStatus { get; init; }
+    public MaritalStatusEnum? MaritalStatus { get; set; }
 
     /// <summary>
     /// The employee's date of birth.
     /// </summary>
     [JsonPropertyName("date_of_birth")]
-    public DateTime? DateOfBirth { get; init; }
+    public DateTime? DateOfBirth { get; set; }
 
     /// <summary>
     /// The date that the employee was hired, usually the day that an offer letter is signed. If an employee has multiple hire dates from previous employments, this represents the most recent hire date. Note: If you're looking for the employee's start date, refer to the start_date field.
     /// </summary>
     [JsonPropertyName("hire_date")]
-    public DateTime? HireDate { get; init; }
+    public DateTime? HireDate { get; set; }
 
     /// <summary>
     /// The date that the employee started working. If an employee was rehired, the most recent start date will be returned.
     /// </summary>
     [JsonPropertyName("start_date")]
-    public DateTime? StartDate { get; init; }
+    public DateTime? StartDate { get; set; }
 
     /// <summary>
     /// When the third party's employee was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// The employment status of the employee.
@@ -224,32 +223,32 @@ public class Employee
     /// - `INACTIVE` - INACTIVE
     /// </summary>
     [JsonPropertyName("employment_status")]
-    public EmploymentStatusEnum? EmploymentStatus { get; init; }
+    public EmploymentStatusEnum? EmploymentStatus { get; set; }
 
     /// <summary>
     /// The employee's termination date.
     /// </summary>
     [JsonPropertyName("termination_date")]
-    public DateTime? TerminationDate { get; init; }
+    public DateTime? TerminationDate { get; set; }
 
     /// <summary>
     /// The URL of the employee's avatar image.
     /// </summary>
     [JsonPropertyName("avatar")]
-    public string? Avatar { get; init; }
+    public string? Avatar { get; set; }
 
     /// <summary>
     /// Custom fields configured for a given model.
     /// </summary>
     [JsonPropertyName("custom_fields")]
-    public Dictionary<string, object>? CustomFields { get; init; }
+    public Dictionary<string, object?>? CustomFields { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/EmployeePayrollRun.cs b/src/Merge.Client/Hris/Types/EmployeePayrollRun.cs
index 9f21e5fa..5b8ab3c6 100644
--- a/src/Merge.Client/Hris/Types/EmployeePayrollRun.cs
+++ b/src/Merge.Client/Hris/Types/EmployeePayrollRun.cs
@@ -1,97 +1,96 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class EmployeePayrollRun
+public record EmployeePayrollRun
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The employee whose payroll is being run.
     /// </summary>
     [JsonPropertyName("employee")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Employee { get; init; }
+    public OneOf<string, Employee>? Employee { get; set; }
 
     /// <summary>
     /// The payroll being run.
     /// </summary>
     [JsonPropertyName("payroll_run")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, PayrollRun>>))]
-    public OneOf<string, PayrollRun>? PayrollRun { get; init; }
+    public OneOf<string, PayrollRun>? PayrollRun { get; set; }
 
     /// <summary>
     /// The total earnings throughout a given period for an employee before any deductions are made.
     /// </summary>
     [JsonPropertyName("gross_pay")]
-    public double? GrossPay { get; init; }
+    public double? GrossPay { get; set; }
 
     /// <summary>
     /// The take-home pay throughout a given period for an employee after deductions are made.
     /// </summary>
     [JsonPropertyName("net_pay")]
-    public double? NetPay { get; init; }
+    public double? NetPay { get; set; }
 
     /// <summary>
     /// The day and time the payroll run started.
     /// </summary>
     [JsonPropertyName("start_date")]
-    public DateTime? StartDate { get; init; }
+    public DateTime? StartDate { get; set; }
 
     /// <summary>
     /// The day and time the payroll run ended.
     /// </summary>
     [JsonPropertyName("end_date")]
-    public DateTime? EndDate { get; init; }
+    public DateTime? EndDate { get; set; }
 
     /// <summary>
     /// The day and time the payroll run was checked.
     /// </summary>
     [JsonPropertyName("check_date")]
-    public DateTime? CheckDate { get; init; }
+    public DateTime? CheckDate { get; set; }
 
     [JsonPropertyName("earnings")]
-    public IEnumerable<Earning>? Earnings { get; init; }
+    public IEnumerable<Earning>? Earnings { get; set; }
 
     [JsonPropertyName("deductions")]
-    public IEnumerable<Deduction>? Deductions { get; init; }
+    public IEnumerable<Deduction>? Deductions { get; set; }
 
     [JsonPropertyName("taxes")]
-    public IEnumerable<Tax>? Taxes { get; init; }
+    public IEnumerable<Tax>? Taxes { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/EmployeeRequest.cs b/src/Merge.Client/Hris/Types/EmployeeRequest.cs
index 8f781fce..db1e32cc 100644
--- a/src/Merge.Client/Hris/Types/EmployeeRequest.cs
+++ b/src/Merge.Client/Hris/Types/EmployeeRequest.cs
@@ -1,56 +1,55 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class EmployeeRequest
+public record EmployeeRequest
 {
     /// <summary>
     /// The employee's number that appears in the third-party integration's UI.
     /// </summary>
     [JsonPropertyName("employee_number")]
-    public string? EmployeeNumber { get; init; }
+    public string? EmployeeNumber { get; set; }
 
     /// <summary>
     /// The ID of the employee's company.
     /// </summary>
     [JsonPropertyName("company")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Company>>))]
-    public OneOf<string, Company>? Company { get; init; }
+    public OneOf<string, Company>? Company { get; set; }
 
     /// <summary>
     /// The employee's first name.
     /// </summary>
     [JsonPropertyName("first_name")]
-    public string? FirstName { get; init; }
+    public string? FirstName { get; set; }
 
     /// <summary>
     /// The employee's last name.
     /// </summary>
     [JsonPropertyName("last_name")]
-    public string? LastName { get; init; }
+    public string? LastName { get; set; }
 
     /// <summary>
     /// The employee's preferred first name.
     /// </summary>
     [JsonPropertyName("preferred_name")]
-    public string? PreferredName { get; init; }
+    public string? PreferredName { get; set; }
 
     /// <summary>
     /// The employee's full name, to use for display purposes. If a preferred first name is available, the full name will include the preferred first name.
     /// </summary>
     [JsonPropertyName("display_full_name")]
-    public string? DisplayFullName { get; init; }
+    public string? DisplayFullName { get; set; }
 
     /// <summary>
     /// The employee's username that appears in the remote UI.
     /// </summary>
     [JsonPropertyName("username")]
-    public string? Username { get; init; }
+    public string? Username { get; set; }
 
     [JsonPropertyName("groups")]
     [JsonConverter(
@@ -59,25 +58,25 @@ public class EmployeeRequest
             OneOfSerializer<OneOf<string, Group>>
         >)
     )]
-    public IEnumerable<OneOf<string, Group>>? Groups { get; init; }
+    public IEnumerable<OneOf<string, Group>>? Groups { get; set; }
 
     /// <summary>
     /// The employee's work email.
     /// </summary>
     [JsonPropertyName("work_email")]
-    public string? WorkEmail { get; init; }
+    public string? WorkEmail { get; set; }
 
     /// <summary>
     /// The employee's personal email.
     /// </summary>
     [JsonPropertyName("personal_email")]
-    public string? PersonalEmail { get; init; }
+    public string? PersonalEmail { get; set; }
 
     /// <summary>
     /// The employee's mobile phone number.
     /// </summary>
     [JsonPropertyName("mobile_phone_number")]
-    public string? MobilePhoneNumber { get; init; }
+    public string? MobilePhoneNumber { get; set; }
 
     /// <summary>
     /// Array of `Employment` IDs for this Employee.
@@ -89,48 +88,48 @@ public class EmployeeRequest
             OneOfSerializer<OneOf<string, Employment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Employment>>? Employments { get; init; }
+    public IEnumerable<OneOf<string, Employment>>? Employments { get; set; }
 
     /// <summary>
     /// The employee's home address.
     /// </summary>
     [JsonPropertyName("home_location")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Location>>))]
-    public OneOf<string, Location>? HomeLocation { get; init; }
+    public OneOf<string, Location>? HomeLocation { get; set; }
 
     /// <summary>
     /// The employee's work address.
     /// </summary>
     [JsonPropertyName("work_location")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Location>>))]
-    public OneOf<string, Location>? WorkLocation { get; init; }
+    public OneOf<string, Location>? WorkLocation { get; set; }
 
     /// <summary>
     /// The employee ID of the employee's manager.
     /// </summary>
     [JsonPropertyName("manager")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Manager { get; init; }
+    public OneOf<string, Employee>? Manager { get; set; }
 
     /// <summary>
     /// The employee's team.
     /// </summary>
     [JsonPropertyName("team")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Team>>))]
-    public OneOf<string, Team>? Team { get; init; }
+    public OneOf<string, Team>? Team { get; set; }
 
     /// <summary>
     /// The employee's pay group
     /// </summary>
     [JsonPropertyName("pay_group")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, PayGroup>>))]
-    public OneOf<string, PayGroup>? PayGroup { get; init; }
+    public OneOf<string, PayGroup>? PayGroup { get; set; }
 
     /// <summary>
     /// The employee's social security number.
     /// </summary>
     [JsonPropertyName("ssn")]
-    public string? Ssn { get; init; }
+    public string? Ssn { get; set; }
 
     /// <summary>
     /// The employee's gender.
@@ -142,7 +141,7 @@ public class EmployeeRequest
     /// - `PREFER_NOT_TO_DISCLOSE` - PREFER_NOT_TO_DISCLOSE
     /// </summary>
     [JsonPropertyName("gender")]
-    public GenderEnum? Gender { get; init; }
+    public GenderEnum? Gender { get; set; }
 
     /// <summary>
     /// The employee's ethnicity.
@@ -157,7 +156,7 @@ public class EmployeeRequest
     /// - `PREFER_NOT_TO_DISCLOSE` - PREFER_NOT_TO_DISCLOSE
     /// </summary>
     [JsonPropertyName("ethnicity")]
-    public EthnicityEnum? Ethnicity { get; init; }
+    public EthnicityEnum? Ethnicity { get; set; }
 
     /// <summary>
     /// The employee's filing status as related to marital status.
@@ -169,25 +168,25 @@ public class EmployeeRequest
     /// - `QUALIFYING_WIDOW_OR_WIDOWER_WITH_DEPENDENT_CHILD` - QUALIFYING_WIDOW_OR_WIDOWER_WITH_DEPENDENT_CHILD
     /// </summary>
     [JsonPropertyName("marital_status")]
-    public MaritalStatusEnum? MaritalStatus { get; init; }
+    public MaritalStatusEnum? MaritalStatus { get; set; }
 
     /// <summary>
     /// The employee's date of birth.
     /// </summary>
     [JsonPropertyName("date_of_birth")]
-    public DateTime? DateOfBirth { get; init; }
+    public DateTime? DateOfBirth { get; set; }
 
     /// <summary>
     /// The date that the employee was hired, usually the day that an offer letter is signed. If an employee has multiple hire dates from previous employments, this represents the most recent hire date. Note: If you're looking for the employee's start date, refer to the start_date field.
     /// </summary>
     [JsonPropertyName("hire_date")]
-    public DateTime? HireDate { get; init; }
+    public DateTime? HireDate { get; set; }
 
     /// <summary>
     /// The date that the employee started working. If an employee was rehired, the most recent start date will be returned.
     /// </summary>
     [JsonPropertyName("start_date")]
-    public DateTime? StartDate { get; init; }
+    public DateTime? StartDate { get; set; }
 
     /// <summary>
     /// The employment status of the employee.
@@ -197,23 +196,23 @@ public class EmployeeRequest
     /// - `INACTIVE` - INACTIVE
     /// </summary>
     [JsonPropertyName("employment_status")]
-    public EmploymentStatusEnum? EmploymentStatus { get; init; }
+    public EmploymentStatusEnum? EmploymentStatus { get; set; }
 
     /// <summary>
     /// The employee's termination date.
     /// </summary>
     [JsonPropertyName("termination_date")]
-    public DateTime? TerminationDate { get; init; }
+    public DateTime? TerminationDate { get; set; }
 
     /// <summary>
     /// The URL of the employee's avatar image.
     /// </summary>
     [JsonPropertyName("avatar")]
-    public string? Avatar { get; init; }
+    public string? Avatar { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/EmployeeResponse.cs b/src/Merge.Client/Hris/Types/EmployeeResponse.cs
index bf704d27..f55c4254 100644
--- a/src/Merge.Client/Hris/Types/EmployeeResponse.cs
+++ b/src/Merge.Client/Hris/Types/EmployeeResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class EmployeeResponse
+public record EmployeeResponse
 {
     [JsonPropertyName("model")]
-    public Employee Model { get; init; }
+    public required Employee Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/EmployerBenefit.cs b/src/Merge.Client/Hris/Types/EmployerBenefit.cs
index a12183c3..af13b503 100644
--- a/src/Merge.Client/Hris/Types/EmployerBenefit.cs
+++ b/src/Merge.Client/Hris/Types/EmployerBenefit.cs
@@ -1,32 +1,31 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class EmployerBenefit
+public record EmployerBenefit
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The type of benefit plan.
@@ -38,35 +37,35 @@ public class EmployerBenefit
     /// - `OTHER` - OTHER
     /// </summary>
     [JsonPropertyName("benefit_plan_type")]
-    public BenefitPlanTypeEnum? BenefitPlanType { get; init; }
+    public BenefitPlanTypeEnum? BenefitPlanType { get; set; }
 
     /// <summary>
     /// The employer benefit's name - typically the carrier or network name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The employer benefit's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The employer benefit's deduction code.
     /// </summary>
     [JsonPropertyName("deduction_code")]
-    public string? DeductionCode { get; init; }
+    public string? DeductionCode { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<Dictionary<string, object>>? RemoteData { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/Employment.cs b/src/Merge.Client/Hris/Types/Employment.cs
index e942b77a..dc01e430 100644
--- a/src/Merge.Client/Hris/Types/Employment.cs
+++ b/src/Merge.Client/Hris/Types/Employment.cs
@@ -1,53 +1,52 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Employment
+public record Employment
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The employee holding this position.
     /// </summary>
     [JsonPropertyName("employee")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Employee { get; init; }
+    public OneOf<string, Employee>? Employee { get; set; }
 
     /// <summary>
     /// The position's title.
     /// </summary>
     [JsonPropertyName("job_title")]
-    public string? JobTitle { get; init; }
+    public string? JobTitle { get; set; }
 
     /// <summary>
     /// The position's pay rate in dollars.
     /// </summary>
     [JsonPropertyName("pay_rate")]
-    public double? PayRate { get; init; }
+    public double? PayRate { get; set; }
 
     /// <summary>
     /// The time period this pay rate encompasses.
@@ -63,7 +62,7 @@ public class Employment
     /// - `YEAR` - YEAR
     /// </summary>
     [JsonPropertyName("pay_period")]
-    public PayPeriodEnum? PayPeriod { get; init; }
+    public PayPeriodEnum? PayPeriod { get; set; }
 
     /// <summary>
     /// The position's pay frequency.
@@ -79,7 +78,7 @@ public class Employment
     /// - `SEMIMONTHLY` - SEMIMONTHLY
     /// </summary>
     [JsonPropertyName("pay_frequency")]
-    public PayFrequencyEnum? PayFrequency { get; init; }
+    public PayFrequencyEnum? PayFrequency { get; set; }
 
     /// <summary>
     /// The position's currency code.
@@ -392,14 +391,14 @@ public class Employment
     /// - `ZWL` - Zimbabwean Dollar (2009)
     /// </summary>
     [JsonPropertyName("pay_currency")]
-    public PayCurrencyEnum? PayCurrency { get; init; }
+    public PayCurrencyEnum? PayCurrency { get; set; }
 
     /// <summary>
     /// The employment's pay group
     /// </summary>
     [JsonPropertyName("pay_group")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, PayGroup>>))]
-    public OneOf<string, PayGroup>? PayGroup { get; init; }
+    public OneOf<string, PayGroup>? PayGroup { get; set; }
 
     /// <summary>
     /// The position's FLSA status.
@@ -410,13 +409,13 @@ public class Employment
     /// - `OWNER` - OWNER
     /// </summary>
     [JsonPropertyName("flsa_status")]
-    public FlsaStatusEnum? FlsaStatus { get; init; }
+    public FlsaStatusEnum? FlsaStatus { get; set; }
 
     /// <summary>
     /// The position's effective date.
     /// </summary>
     [JsonPropertyName("effective_date")]
-    public DateTime? EffectiveDate { get; init; }
+    public DateTime? EffectiveDate { get; set; }
 
     /// <summary>
     /// The position's type of employment.
@@ -428,17 +427,17 @@ public class Employment
     /// - `FREELANCE` - FREELANCE
     /// </summary>
     [JsonPropertyName("employment_type")]
-    public EmploymentTypeEnum? EmploymentType { get; init; }
+    public EmploymentTypeEnum? EmploymentType { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/EmploymentStatusEnum.cs b/src/Merge.Client/Hris/Types/EmploymentStatusEnum.cs
index 72cbb783..9e0da61c 100644
--- a/src/Merge.Client/Hris/Types/EmploymentStatusEnum.cs
+++ b/src/Merge.Client/Hris/Types/EmploymentStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/EmploymentTypeEnum.cs b/src/Merge.Client/Hris/Types/EmploymentTypeEnum.cs
index 4e25e5d7..26d17b86 100644
--- a/src/Merge.Client/Hris/Types/EmploymentTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/EmploymentTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/EnabledActionsEnum.cs b/src/Merge.Client/Hris/Types/EnabledActionsEnum.cs
index 6b1bbe6c..38556e91 100644
--- a/src/Merge.Client/Hris/Types/EnabledActionsEnum.cs
+++ b/src/Merge.Client/Hris/Types/EnabledActionsEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/EncodingEnum.cs b/src/Merge.Client/Hris/Types/EncodingEnum.cs
index 483b5387..3ad255e4 100644
--- a/src/Merge.Client/Hris/Types/EncodingEnum.cs
+++ b/src/Merge.Client/Hris/Types/EncodingEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/ErrorValidationProblem.cs b/src/Merge.Client/Hris/Types/ErrorValidationProblem.cs
index 60c7a104..642995c2 100644
--- a/src/Merge.Client/Hris/Types/ErrorValidationProblem.cs
+++ b/src/Merge.Client/Hris/Types/ErrorValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class ErrorValidationProblem
+public record ErrorValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/EthnicityEnum.cs b/src/Merge.Client/Hris/Types/EthnicityEnum.cs
index 4cb05c2a..7926a47e 100644
--- a/src/Merge.Client/Hris/Types/EthnicityEnum.cs
+++ b/src/Merge.Client/Hris/Types/EthnicityEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/EventTypeEnum.cs b/src/Merge.Client/Hris/Types/EventTypeEnum.cs
index 6d73c538..35f4ccf7 100644
--- a/src/Merge.Client/Hris/Types/EventTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/EventTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/ExternalTargetFieldApi.cs b/src/Merge.Client/Hris/Types/ExternalTargetFieldApi.cs
index f221b005..4314b0ca 100644
--- a/src/Merge.Client/Hris/Types/ExternalTargetFieldApi.cs
+++ b/src/Merge.Client/Hris/Types/ExternalTargetFieldApi.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Hris;
 
-public class ExternalTargetFieldApi
+public record ExternalTargetFieldApi
 {
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_mapped")]
-    public string? IsMapped { get; init; }
+    public string? IsMapped { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/ExternalTargetFieldApiResponse.cs b/src/Merge.Client/Hris/Types/ExternalTargetFieldApiResponse.cs
index c49e22c0..e357a090 100644
--- a/src/Merge.Client/Hris/Types/ExternalTargetFieldApiResponse.cs
+++ b/src/Merge.Client/Hris/Types/ExternalTargetFieldApiResponse.cs
@@ -1,57 +1,56 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class ExternalTargetFieldApiResponse
+public record ExternalTargetFieldApiResponse
 {
     [JsonPropertyName("Benefit")]
-    public IEnumerable<ExternalTargetFieldApi>? Benefit { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Benefit { get; set; }
 
     [JsonPropertyName("EmployerBenefit")]
-    public IEnumerable<ExternalTargetFieldApi>? EmployerBenefit { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? EmployerBenefit { get; set; }
 
     [JsonPropertyName("Company")]
-    public IEnumerable<ExternalTargetFieldApi>? Company { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Company { get; set; }
 
     [JsonPropertyName("EmployeePayrollRun")]
-    public IEnumerable<ExternalTargetFieldApi>? EmployeePayrollRun { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? EmployeePayrollRun { get; set; }
 
     [JsonPropertyName("Employee")]
-    public IEnumerable<ExternalTargetFieldApi>? Employee { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Employee { get; set; }
 
     [JsonPropertyName("Employment")]
-    public IEnumerable<ExternalTargetFieldApi>? Employment { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Employment { get; set; }
 
     [JsonPropertyName("Location")]
-    public IEnumerable<ExternalTargetFieldApi>? Location { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Location { get; set; }
 
     [JsonPropertyName("PayrollRun")]
-    public IEnumerable<ExternalTargetFieldApi>? PayrollRun { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? PayrollRun { get; set; }
 
     [JsonPropertyName("Team")]
-    public IEnumerable<ExternalTargetFieldApi>? Team { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Team { get; set; }
 
     [JsonPropertyName("TimeOff")]
-    public IEnumerable<ExternalTargetFieldApi>? TimeOff { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? TimeOff { get; set; }
 
     [JsonPropertyName("TimeOffBalance")]
-    public IEnumerable<ExternalTargetFieldApi>? TimeOffBalance { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? TimeOffBalance { get; set; }
 
     [JsonPropertyName("BankInfo")]
-    public IEnumerable<ExternalTargetFieldApi>? BankInfo { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? BankInfo { get; set; }
 
     [JsonPropertyName("PayGroup")]
-    public IEnumerable<ExternalTargetFieldApi>? PayGroup { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? PayGroup { get; set; }
 
     [JsonPropertyName("Group")]
-    public IEnumerable<ExternalTargetFieldApi>? Group { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Group { get; set; }
 
     [JsonPropertyName("Dependent")]
-    public IEnumerable<ExternalTargetFieldApi>? Dependent { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Dependent { get; set; }
 
     [JsonPropertyName("TimesheetEntry")]
-    public IEnumerable<ExternalTargetFieldApi>? TimesheetEntry { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? TimesheetEntry { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FieldMappingApiInstance.cs b/src/Merge.Client/Hris/Types/FieldMappingApiInstance.cs
index d7953e73..f3783716 100644
--- a/src/Merge.Client/Hris/Types/FieldMappingApiInstance.cs
+++ b/src/Merge.Client/Hris/Types/FieldMappingApiInstance.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class FieldMappingApiInstance
+public record FieldMappingApiInstance
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("is_integration_wide")]
-    public bool? IsIntegrationWide { get; init; }
+    public bool? IsIntegrationWide { get; set; }
 
     [JsonPropertyName("target_field")]
-    public FieldMappingApiInstanceTargetField? TargetField { get; init; }
+    public FieldMappingApiInstanceTargetField? TargetField { get; set; }
 
     [JsonPropertyName("remote_field")]
-    public FieldMappingApiInstanceRemoteField? RemoteField { get; init; }
+    public FieldMappingApiInstanceRemoteField? RemoteField { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FieldMappingApiInstanceRemoteField.cs b/src/Merge.Client/Hris/Types/FieldMappingApiInstanceRemoteField.cs
index 2200b7cc..784f62d0 100644
--- a/src/Merge.Client/Hris/Types/FieldMappingApiInstanceRemoteField.cs
+++ b/src/Merge.Client/Hris/Types/FieldMappingApiInstanceRemoteField.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class FieldMappingApiInstanceRemoteField
+public record FieldMappingApiInstanceRemoteField
 {
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_endpoint_info")]
-    public FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs b/src/Merge.Client/Hris/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
index f0cc6faa..6ac95e9b 100644
--- a/src/Merge.Client/Hris/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
+++ b/src/Merge.Client/Hris/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Hris;
 
-public class FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
+public record FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string? Method { get; init; }
+    public string? Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string? UrlPath { get; init; }
+    public string? UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<string>? FieldTraversalPath { get; init; }
+    public IEnumerable<string>? FieldTraversalPath { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FieldMappingApiInstanceResponse.cs b/src/Merge.Client/Hris/Types/FieldMappingApiInstanceResponse.cs
index 5ab6cfbb..72f70a49 100644
--- a/src/Merge.Client/Hris/Types/FieldMappingApiInstanceResponse.cs
+++ b/src/Merge.Client/Hris/Types/FieldMappingApiInstanceResponse.cs
@@ -1,57 +1,56 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class FieldMappingApiInstanceResponse
+public record FieldMappingApiInstanceResponse
 {
     [JsonPropertyName("Benefit")]
-    public IEnumerable<FieldMappingApiInstance>? Benefit { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Benefit { get; set; }
 
     [JsonPropertyName("EmployerBenefit")]
-    public IEnumerable<FieldMappingApiInstance>? EmployerBenefit { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? EmployerBenefit { get; set; }
 
     [JsonPropertyName("Company")]
-    public IEnumerable<FieldMappingApiInstance>? Company { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Company { get; set; }
 
     [JsonPropertyName("EmployeePayrollRun")]
-    public IEnumerable<FieldMappingApiInstance>? EmployeePayrollRun { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? EmployeePayrollRun { get; set; }
 
     [JsonPropertyName("Employee")]
-    public IEnumerable<FieldMappingApiInstance>? Employee { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Employee { get; set; }
 
     [JsonPropertyName("Employment")]
-    public IEnumerable<FieldMappingApiInstance>? Employment { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Employment { get; set; }
 
     [JsonPropertyName("Location")]
-    public IEnumerable<FieldMappingApiInstance>? Location { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Location { get; set; }
 
     [JsonPropertyName("PayrollRun")]
-    public IEnumerable<FieldMappingApiInstance>? PayrollRun { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? PayrollRun { get; set; }
 
     [JsonPropertyName("Team")]
-    public IEnumerable<FieldMappingApiInstance>? Team { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Team { get; set; }
 
     [JsonPropertyName("TimeOff")]
-    public IEnumerable<FieldMappingApiInstance>? TimeOff { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? TimeOff { get; set; }
 
     [JsonPropertyName("TimeOffBalance")]
-    public IEnumerable<FieldMappingApiInstance>? TimeOffBalance { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? TimeOffBalance { get; set; }
 
     [JsonPropertyName("BankInfo")]
-    public IEnumerable<FieldMappingApiInstance>? BankInfo { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? BankInfo { get; set; }
 
     [JsonPropertyName("PayGroup")]
-    public IEnumerable<FieldMappingApiInstance>? PayGroup { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? PayGroup { get; set; }
 
     [JsonPropertyName("Group")]
-    public IEnumerable<FieldMappingApiInstance>? Group { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Group { get; set; }
 
     [JsonPropertyName("Dependent")]
-    public IEnumerable<FieldMappingApiInstance>? Dependent { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Dependent { get; set; }
 
     [JsonPropertyName("TimesheetEntry")]
-    public IEnumerable<FieldMappingApiInstance>? TimesheetEntry { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? TimesheetEntry { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FieldMappingApiInstanceTargetField.cs b/src/Merge.Client/Hris/Types/FieldMappingApiInstanceTargetField.cs
index b536a11c..8f4237f2 100644
--- a/src/Merge.Client/Hris/Types/FieldMappingApiInstanceTargetField.cs
+++ b/src/Merge.Client/Hris/Types/FieldMappingApiInstanceTargetField.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Hris;
 
-public class FieldMappingApiInstanceTargetField
+public record FieldMappingApiInstanceTargetField
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string Description { get; init; }
+    public required string Description { get; set; }
 
     [JsonPropertyName("is_organization_wide")]
-    public bool IsOrganizationWide { get; init; }
+    public required bool IsOrganizationWide { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FieldMappingInstanceResponse.cs b/src/Merge.Client/Hris/Types/FieldMappingInstanceResponse.cs
index b27afe2c..3fec4504 100644
--- a/src/Merge.Client/Hris/Types/FieldMappingInstanceResponse.cs
+++ b/src/Merge.Client/Hris/Types/FieldMappingInstanceResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class FieldMappingInstanceResponse
+public record FieldMappingInstanceResponse
 {
     [JsonPropertyName("model")]
-    public FieldMappingApiInstance Model { get; init; }
+    public required FieldMappingApiInstance Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FieldPermissionDeserializer.cs b/src/Merge.Client/Hris/Types/FieldPermissionDeserializer.cs
index c2a359ed..d81cf212 100644
--- a/src/Merge.Client/Hris/Types/FieldPermissionDeserializer.cs
+++ b/src/Merge.Client/Hris/Types/FieldPermissionDeserializer.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Hris;
 
-public class FieldPermissionDeserializer
+public record FieldPermissionDeserializer
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FieldPermissionDeserializerRequest.cs b/src/Merge.Client/Hris/Types/FieldPermissionDeserializerRequest.cs
index f2d228a4..e9995334 100644
--- a/src/Merge.Client/Hris/Types/FieldPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Hris/Types/FieldPermissionDeserializerRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Hris;
 
-public class FieldPermissionDeserializerRequest
+public record FieldPermissionDeserializerRequest
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/FlsaStatusEnum.cs b/src/Merge.Client/Hris/Types/FlsaStatusEnum.cs
index d16aa9ad..267b31e1 100644
--- a/src/Merge.Client/Hris/Types/FlsaStatusEnum.cs
+++ b/src/Merge.Client/Hris/Types/FlsaStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/GenderEnum.cs b/src/Merge.Client/Hris/Types/GenderEnum.cs
index cab6f8cb..296b4c3a 100644
--- a/src/Merge.Client/Hris/Types/GenderEnum.cs
+++ b/src/Merge.Client/Hris/Types/GenderEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/Group.cs b/src/Merge.Client/Hris/Types/Group.cs
index 704ecf1f..75fb2b3d 100644
--- a/src/Merge.Client/Hris/Types/Group.cs
+++ b/src/Merge.Client/Hris/Types/Group.cs
@@ -1,44 +1,43 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Group
+public record Group
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The parent group for this group.
     /// </summary>
     [JsonPropertyName("parent_group")]
-    public string? ParentGroup { get; init; }
+    public string? ParentGroup { get; set; }
 
     /// <summary>
     /// The group name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The Group type returned directly from the third-party.
@@ -50,23 +49,23 @@ public class Group
     /// - `GROUP` - GROUP
     /// </summary>
     [JsonPropertyName("type")]
-    public GroupTypeEnum? Type { get; init; }
+    public GroupTypeEnum? Type { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// Indicates whether the Group refers to a team in the third party platform. Note that this is an opinionated view based on how Merge observes most organizations representing teams in each third party platform. If your customer uses a platform different from most, there is a chance this will not be correct.
     /// </summary>
     [JsonPropertyName("is_commonly_used_as_team")]
-    public bool? IsCommonlyUsedAsTeam { get; init; }
+    public bool? IsCommonlyUsedAsTeam { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/GroupTypeEnum.cs b/src/Merge.Client/Hris/Types/GroupTypeEnum.cs
index e02b3300..925e8e91 100644
--- a/src/Merge.Client/Hris/Types/GroupTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/GroupTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/IndividualCommonModelScopeDeserializer.cs b/src/Merge.Client/Hris/Types/IndividualCommonModelScopeDeserializer.cs
index e218ffe7..da01d2c6 100644
--- a/src/Merge.Client/Hris/Types/IndividualCommonModelScopeDeserializer.cs
+++ b/src/Merge.Client/Hris/Types/IndividualCommonModelScopeDeserializer.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class IndividualCommonModelScopeDeserializer
+public record IndividualCommonModelScopeDeserializer
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializer? FieldPermissions { get; init; }
+    public FieldPermissionDeserializer? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/IndividualCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Hris/Types/IndividualCommonModelScopeDeserializerRequest.cs
index 384c65cf..760b6424 100644
--- a/src/Merge.Client/Hris/Types/IndividualCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Hris/Types/IndividualCommonModelScopeDeserializerRequest.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class IndividualCommonModelScopeDeserializerRequest
+public record IndividualCommonModelScopeDeserializerRequest
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializerRequest? FieldPermissions { get; init; }
+    public FieldPermissionDeserializerRequest? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/Issue.cs b/src/Merge.Client/Hris/Types/Issue.cs
index 9a481fef..d95948c3 100644
--- a/src/Merge.Client/Hris/Types/Issue.cs
+++ b/src/Merge.Client/Hris/Types/Issue.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Issue
+public record Issue
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -17,23 +16,23 @@ public class Issue
     /// - `RESOLVED` - RESOLVED
     /// </summary>
     [JsonPropertyName("status")]
-    public IssueStatusEnum? Status { get; init; }
+    public IssueStatusEnum? Status { get; set; }
 
     [JsonPropertyName("error_description")]
-    public string ErrorDescription { get; init; }
+    public required string ErrorDescription { get; set; }
 
     [JsonPropertyName("end_user")]
-    public Dictionary<string, object>? EndUser { get; init; }
+    public Dictionary<string, object?>? EndUser { get; set; }
 
     [JsonPropertyName("first_incident_time")]
-    public DateTime? FirstIncidentTime { get; init; }
+    public DateTime? FirstIncidentTime { get; set; }
 
     [JsonPropertyName("last_incident_time")]
-    public DateTime? LastIncidentTime { get; init; }
+    public DateTime? LastIncidentTime { get; set; }
 
     [JsonPropertyName("is_muted")]
-    public bool? IsMuted { get; init; }
+    public bool? IsMuted { get; set; }
 
     [JsonPropertyName("error_details")]
-    public IEnumerable<string>? ErrorDetails { get; init; }
+    public IEnumerable<string>? ErrorDetails { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/IssueStatusEnum.cs b/src/Merge.Client/Hris/Types/IssueStatusEnum.cs
index b27c99f9..9f0d9abc 100644
--- a/src/Merge.Client/Hris/Types/IssueStatusEnum.cs
+++ b/src/Merge.Client/Hris/Types/IssueStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/LinkToken.cs b/src/Merge.Client/Hris/Types/LinkToken.cs
index 248da605..9d234159 100644
--- a/src/Merge.Client/Hris/Types/LinkToken.cs
+++ b/src/Merge.Client/Hris/Types/LinkToken.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Hris;
 
-public class LinkToken
+public record LinkToken
 {
     [JsonPropertyName("link_token")]
-    public string LinkToken_ { get; init; }
+    public required string LinkToken_ { get; set; }
 
     [JsonPropertyName("integration_name")]
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     [JsonPropertyName("magic_link_url")]
-    public string? MagicLinkUrl { get; init; }
+    public string? MagicLinkUrl { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/LinkedAccountStatus.cs b/src/Merge.Client/Hris/Types/LinkedAccountStatus.cs
index c26c4242..00f35cbb 100644
--- a/src/Merge.Client/Hris/Types/LinkedAccountStatus.cs
+++ b/src/Merge.Client/Hris/Types/LinkedAccountStatus.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Hris;
 
-public class LinkedAccountStatus
+public record LinkedAccountStatus
 {
     [JsonPropertyName("linked_account_status")]
-    public string LinkedAccountStatus_ { get; init; }
+    public required string LinkedAccountStatus_ { get; set; }
 
     [JsonPropertyName("can_make_request")]
-    public bool CanMakeRequest { get; init; }
+    public required bool CanMakeRequest { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/Location.cs b/src/Merge.Client/Hris/Types/Location.cs
index 9d1ef1bc..34b173c8 100644
--- a/src/Merge.Client/Hris/Types/Location.cs
+++ b/src/Merge.Client/Hris/Types/Location.cs
@@ -1,74 +1,73 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Location
+public record Location
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The location's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The location's phone number.
     /// </summary>
     [JsonPropertyName("phone_number")]
-    public string? PhoneNumber { get; init; }
+    public string? PhoneNumber { get; set; }
 
     /// <summary>
     /// Line 1 of the location's street address.
     /// </summary>
     [JsonPropertyName("street_1")]
-    public string? Street1 { get; init; }
+    public string? Street1 { get; set; }
 
     /// <summary>
     /// Line 2 of the location's street address.
     /// </summary>
     [JsonPropertyName("street_2")]
-    public string? Street2 { get; init; }
+    public string? Street2 { get; set; }
 
     /// <summary>
     /// The location's city.
     /// </summary>
     [JsonPropertyName("city")]
-    public string? City { get; init; }
+    public string? City { get; set; }
 
     /// <summary>
     /// The location's state. Represents a region if outside of the US.
     /// </summary>
     [JsonPropertyName("state")]
-    public string? State { get; init; }
+    public string? State { get; set; }
 
     /// <summary>
     /// The location's zip code or postal code.
     /// </summary>
     [JsonPropertyName("zip_code")]
-    public string? ZipCode { get; init; }
+    public string? ZipCode { get; set; }
 
     /// <summary>
     /// The location's country.
@@ -324,7 +323,7 @@ public class Location
     /// - `ZW` - Zimbabwe
     /// </summary>
     [JsonPropertyName("country")]
-    public CountryEnum? Country { get; init; }
+    public CountryEnum? Country { get; set; }
 
     /// <summary>
     /// The location's type. Can be either WORK or HOME
@@ -333,17 +332,17 @@ public class Location
     /// - `WORK` - WORK
     /// </summary>
     [JsonPropertyName("location_type")]
-    public LocationTypeEnum? LocationType { get; init; }
+    public LocationTypeEnum? LocationType { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/LocationTypeEnum.cs b/src/Merge.Client/Hris/Types/LocationTypeEnum.cs
index 607c3e2f..e785e699 100644
--- a/src/Merge.Client/Hris/Types/LocationTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/LocationTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/MaritalStatusEnum.cs b/src/Merge.Client/Hris/Types/MaritalStatusEnum.cs
index 74b126cf..4de14eaa 100644
--- a/src/Merge.Client/Hris/Types/MaritalStatusEnum.cs
+++ b/src/Merge.Client/Hris/Types/MaritalStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/MetaResponse.cs b/src/Merge.Client/Hris/Types/MetaResponse.cs
index e83af02f..2ba25647 100644
--- a/src/Merge.Client/Hris/Types/MetaResponse.cs
+++ b/src/Merge.Client/Hris/Types/MetaResponse.cs
@@ -1,24 +1,24 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class MetaResponse
+public record MetaResponse
 {
     [JsonPropertyName("request_schema")]
-    public Dictionary<string, object> RequestSchema { get; init; }
+    public Dictionary<string, object?> RequestSchema { get; set; } =
+        new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_field_classes")]
-    public Dictionary<string, object>? RemoteFieldClasses { get; init; }
+    public Dictionary<string, object?>? RemoteFieldClasses { get; set; }
 
     [JsonPropertyName("status")]
-    public LinkedAccountStatus? Status { get; init; }
+    public LinkedAccountStatus? Status { get; set; }
 
     [JsonPropertyName("has_conditional_params")]
-    public bool HasConditionalParams { get; init; }
+    public required bool HasConditionalParams { get; set; }
 
     [JsonPropertyName("has_required_linked_account_params")]
-    public bool HasRequiredLinkedAccountParams { get; init; }
+    public required bool HasRequiredLinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/MethodEnum.cs b/src/Merge.Client/Hris/Types/MethodEnum.cs
index 2143a24f..8bb50635 100644
--- a/src/Merge.Client/Hris/Types/MethodEnum.cs
+++ b/src/Merge.Client/Hris/Types/MethodEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/ModelOperation.cs b/src/Merge.Client/Hris/Types/ModelOperation.cs
index ea5c0eaa..773f94ad 100644
--- a/src/Merge.Client/Hris/Types/ModelOperation.cs
+++ b/src/Merge.Client/Hris/Types/ModelOperation.cs
@@ -4,17 +4,17 @@
 
 namespace Merge.Client.Hris;
 
-public class ModelOperation
+public record ModelOperation
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("available_operations")]
-    public IEnumerable<string> AvailableOperations { get; init; }
+    public IEnumerable<string> AvailableOperations { get; set; } = new List<string>();
 
     [JsonPropertyName("required_post_parameters")]
-    public IEnumerable<string> RequiredPostParameters { get; init; }
+    public IEnumerable<string> RequiredPostParameters { get; set; } = new List<string>();
 
     [JsonPropertyName("supported_fields")]
-    public IEnumerable<string> SupportedFields { get; init; }
+    public IEnumerable<string> SupportedFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Hris/Types/ModelPermissionDeserializer.cs b/src/Merge.Client/Hris/Types/ModelPermissionDeserializer.cs
index 7c57b65a..c0ba5c9c 100644
--- a/src/Merge.Client/Hris/Types/ModelPermissionDeserializer.cs
+++ b/src/Merge.Client/Hris/Types/ModelPermissionDeserializer.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Hris;
 
-public class ModelPermissionDeserializer
+public record ModelPermissionDeserializer
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/ModelPermissionDeserializerRequest.cs b/src/Merge.Client/Hris/Types/ModelPermissionDeserializerRequest.cs
index c874e0eb..26018dd5 100644
--- a/src/Merge.Client/Hris/Types/ModelPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Hris/Types/ModelPermissionDeserializerRequest.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Hris;
 
-public class ModelPermissionDeserializerRequest
+public record ModelPermissionDeserializerRequest
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/MultipartFormFieldRequest.cs b/src/Merge.Client/Hris/Types/MultipartFormFieldRequest.cs
index ae59a133..10f51b75 100644
--- a/src/Merge.Client/Hris/Types/MultipartFormFieldRequest.cs
+++ b/src/Merge.Client/Hris/Types/MultipartFormFieldRequest.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class MultipartFormFieldRequest
+public record MultipartFormFieldRequest
 {
     /// <summary>
     /// The name of the form field
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// The data for the form field.
     /// </summary>
     [JsonPropertyName("data")]
-    public string Data { get; init; }
+    public required string Data { get; set; }
 
     /// <summary>
     /// The encoding of the value of `data`. Defaults to `RAW` if not defined.
@@ -27,17 +26,17 @@ public class MultipartFormFieldRequest
     /// - `GZIP_BASE64` - GZIP_BASE64
     /// </summary>
     [JsonPropertyName("encoding")]
-    public EncodingEnum? Encoding { get; init; }
+    public EncodingEnum? Encoding { get; set; }
 
     /// <summary>
     /// The file name of the form field, if the field is for a file.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The MIME type of the file, if the field is for a file.
     /// </summary>
     [JsonPropertyName("content_type")]
-    public string? ContentType { get; init; }
+    public string? ContentType { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedAccountDetailsAndActionsList.cs b/src/Merge.Client/Hris/Types/PaginatedAccountDetailsAndActionsList.cs
index e3803566..8d3442c5 100644
--- a/src/Merge.Client/Hris/Types/PaginatedAccountDetailsAndActionsList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedAccountDetailsAndActionsList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedAccountDetailsAndActionsList
+public record PaginatedAccountDetailsAndActionsList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AccountDetailsAndActions>? Results { get; init; }
+    public IEnumerable<AccountDetailsAndActions>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedAuditLogEventList.cs b/src/Merge.Client/Hris/Types/PaginatedAuditLogEventList.cs
index 07422e59..f99b36b9 100644
--- a/src/Merge.Client/Hris/Types/PaginatedAuditLogEventList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedAuditLogEventList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedAuditLogEventList
+public record PaginatedAuditLogEventList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AuditLogEvent>? Results { get; init; }
+    public IEnumerable<AuditLogEvent>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedBankInfoList.cs b/src/Merge.Client/Hris/Types/PaginatedBankInfoList.cs
index dbbb8e44..73d0877a 100644
--- a/src/Merge.Client/Hris/Types/PaginatedBankInfoList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedBankInfoList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedBankInfoList
+public record PaginatedBankInfoList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<BankInfo>? Results { get; init; }
+    public IEnumerable<BankInfo>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedBenefitList.cs b/src/Merge.Client/Hris/Types/PaginatedBenefitList.cs
index 00af22fa..54fc96f9 100644
--- a/src/Merge.Client/Hris/Types/PaginatedBenefitList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedBenefitList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedBenefitList
+public record PaginatedBenefitList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Benefit>? Results { get; init; }
+    public IEnumerable<Benefit>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedCompanyList.cs b/src/Merge.Client/Hris/Types/PaginatedCompanyList.cs
index be772d18..3775bcd3 100644
--- a/src/Merge.Client/Hris/Types/PaginatedCompanyList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedCompanyList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedCompanyList
+public record PaginatedCompanyList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Company>? Results { get; init; }
+    public IEnumerable<Company>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedDependentList.cs b/src/Merge.Client/Hris/Types/PaginatedDependentList.cs
index 5a563cc9..413eb1a0 100644
--- a/src/Merge.Client/Hris/Types/PaginatedDependentList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedDependentList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedDependentList
+public record PaginatedDependentList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Dependent>? Results { get; init; }
+    public IEnumerable<Dependent>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedEmployeeList.cs b/src/Merge.Client/Hris/Types/PaginatedEmployeeList.cs
index eaa3ae6e..32e3d752 100644
--- a/src/Merge.Client/Hris/Types/PaginatedEmployeeList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedEmployeeList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedEmployeeList
+public record PaginatedEmployeeList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Employee>? Results { get; init; }
+    public IEnumerable<Employee>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedEmployeePayrollRunList.cs b/src/Merge.Client/Hris/Types/PaginatedEmployeePayrollRunList.cs
index 41aa137c..eb9d4f82 100644
--- a/src/Merge.Client/Hris/Types/PaginatedEmployeePayrollRunList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedEmployeePayrollRunList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedEmployeePayrollRunList
+public record PaginatedEmployeePayrollRunList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<EmployeePayrollRun>? Results { get; init; }
+    public IEnumerable<EmployeePayrollRun>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedEmployerBenefitList.cs b/src/Merge.Client/Hris/Types/PaginatedEmployerBenefitList.cs
index d0786896..417f564b 100644
--- a/src/Merge.Client/Hris/Types/PaginatedEmployerBenefitList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedEmployerBenefitList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedEmployerBenefitList
+public record PaginatedEmployerBenefitList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<EmployerBenefit>? Results { get; init; }
+    public IEnumerable<EmployerBenefit>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedEmploymentList.cs b/src/Merge.Client/Hris/Types/PaginatedEmploymentList.cs
index a72ac5d3..9e2573f2 100644
--- a/src/Merge.Client/Hris/Types/PaginatedEmploymentList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedEmploymentList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedEmploymentList
+public record PaginatedEmploymentList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Employment>? Results { get; init; }
+    public IEnumerable<Employment>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedGroupList.cs b/src/Merge.Client/Hris/Types/PaginatedGroupList.cs
index 758dc80f..52219e9a 100644
--- a/src/Merge.Client/Hris/Types/PaginatedGroupList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedGroupList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedGroupList
+public record PaginatedGroupList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Group>? Results { get; init; }
+    public IEnumerable<Group>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedIssueList.cs b/src/Merge.Client/Hris/Types/PaginatedIssueList.cs
index 13ab659d..13462523 100644
--- a/src/Merge.Client/Hris/Types/PaginatedIssueList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedIssueList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedIssueList
+public record PaginatedIssueList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Issue>? Results { get; init; }
+    public IEnumerable<Issue>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedLocationList.cs b/src/Merge.Client/Hris/Types/PaginatedLocationList.cs
index 2d523a2f..335df34f 100644
--- a/src/Merge.Client/Hris/Types/PaginatedLocationList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedLocationList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedLocationList
+public record PaginatedLocationList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Location>? Results { get; init; }
+    public IEnumerable<Location>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedPayGroupList.cs b/src/Merge.Client/Hris/Types/PaginatedPayGroupList.cs
index 6b766a61..372b883b 100644
--- a/src/Merge.Client/Hris/Types/PaginatedPayGroupList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedPayGroupList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedPayGroupList
+public record PaginatedPayGroupList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<PayGroup>? Results { get; init; }
+    public IEnumerable<PayGroup>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedPayrollRunList.cs b/src/Merge.Client/Hris/Types/PaginatedPayrollRunList.cs
index c10a8c3b..07e8023d 100644
--- a/src/Merge.Client/Hris/Types/PaginatedPayrollRunList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedPayrollRunList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedPayrollRunList
+public record PaginatedPayrollRunList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<PayrollRun>? Results { get; init; }
+    public IEnumerable<PayrollRun>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedSyncStatusList.cs b/src/Merge.Client/Hris/Types/PaginatedSyncStatusList.cs
index 4a4fb250..7c29b4fa 100644
--- a/src/Merge.Client/Hris/Types/PaginatedSyncStatusList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedSyncStatusList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedSyncStatusList
+public record PaginatedSyncStatusList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<SyncStatus>? Results { get; init; }
+    public IEnumerable<SyncStatus>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedTeamList.cs b/src/Merge.Client/Hris/Types/PaginatedTeamList.cs
index 03722b71..b54c9f59 100644
--- a/src/Merge.Client/Hris/Types/PaginatedTeamList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedTeamList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedTeamList
+public record PaginatedTeamList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Team>? Results { get; init; }
+    public IEnumerable<Team>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedTimeOffBalanceList.cs b/src/Merge.Client/Hris/Types/PaginatedTimeOffBalanceList.cs
index 69f62fb6..2f45ca33 100644
--- a/src/Merge.Client/Hris/Types/PaginatedTimeOffBalanceList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedTimeOffBalanceList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedTimeOffBalanceList
+public record PaginatedTimeOffBalanceList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<TimeOffBalance>? Results { get; init; }
+    public IEnumerable<TimeOffBalance>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedTimeOffList.cs b/src/Merge.Client/Hris/Types/PaginatedTimeOffList.cs
index cfa16209..b76d2c3b 100644
--- a/src/Merge.Client/Hris/Types/PaginatedTimeOffList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedTimeOffList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedTimeOffList
+public record PaginatedTimeOffList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<TimeOff>? Results { get; init; }
+    public IEnumerable<TimeOff>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PaginatedTimesheetEntryList.cs b/src/Merge.Client/Hris/Types/PaginatedTimesheetEntryList.cs
index 4688caba..596a16ad 100644
--- a/src/Merge.Client/Hris/Types/PaginatedTimesheetEntryList.cs
+++ b/src/Merge.Client/Hris/Types/PaginatedTimesheetEntryList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PaginatedTimesheetEntryList
+public record PaginatedTimesheetEntryList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<TimesheetEntry>? Results { get; init; }
+    public IEnumerable<TimesheetEntry>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PayCurrencyEnum.cs b/src/Merge.Client/Hris/Types/PayCurrencyEnum.cs
index f061bb8a..168fb3bf 100644
--- a/src/Merge.Client/Hris/Types/PayCurrencyEnum.cs
+++ b/src/Merge.Client/Hris/Types/PayCurrencyEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/PayFrequencyEnum.cs b/src/Merge.Client/Hris/Types/PayFrequencyEnum.cs
index 0477cfb9..51a3182d 100644
--- a/src/Merge.Client/Hris/Types/PayFrequencyEnum.cs
+++ b/src/Merge.Client/Hris/Types/PayFrequencyEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/PayGroup.cs b/src/Merge.Client/Hris/Types/PayGroup.cs
index 4b3ddc35..dce4bd99 100644
--- a/src/Merge.Client/Hris/Types/PayGroup.cs
+++ b/src/Merge.Client/Hris/Types/PayGroup.cs
@@ -1,48 +1,47 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PayGroup
+public record PayGroup
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The pay group name.
     /// </summary>
     [JsonPropertyName("pay_group_name")]
-    public string? PayGroupName { get; init; }
+    public string? PayGroupName { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PayPeriodEnum.cs b/src/Merge.Client/Hris/Types/PayPeriodEnum.cs
index 5e908e8c..64a73a8f 100644
--- a/src/Merge.Client/Hris/Types/PayPeriodEnum.cs
+++ b/src/Merge.Client/Hris/Types/PayPeriodEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/PayrollRun.cs b/src/Merge.Client/Hris/Types/PayrollRun.cs
index 47ef258d..5199e028 100644
--- a/src/Merge.Client/Hris/Types/PayrollRun.cs
+++ b/src/Merge.Client/Hris/Types/PayrollRun.cs
@@ -1,32 +1,31 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class PayrollRun
+public record PayrollRun
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The state of the payroll run
@@ -38,7 +37,7 @@ public class PayrollRun
     /// - `CLOSED` - CLOSED
     /// </summary>
     [JsonPropertyName("run_state")]
-    public RunStateEnum? RunState { get; init; }
+    public RunStateEnum? RunState { get; set; }
 
     /// <summary>
     /// The type of the payroll run
@@ -50,35 +49,35 @@ public class PayrollRun
     /// - `SIGN_ON_BONUS` - SIGN_ON_BONUS
     /// </summary>
     [JsonPropertyName("run_type")]
-    public RunTypeEnum? RunType { get; init; }
+    public RunTypeEnum? RunType { get; set; }
 
     /// <summary>
     /// The day and time the payroll run started.
     /// </summary>
     [JsonPropertyName("start_date")]
-    public DateTime? StartDate { get; init; }
+    public DateTime? StartDate { get; set; }
 
     /// <summary>
     /// The day and time the payroll run ended.
     /// </summary>
     [JsonPropertyName("end_date")]
-    public DateTime? EndDate { get; init; }
+    public DateTime? EndDate { get; set; }
 
     /// <summary>
     /// The day and time the payroll run was checked.
     /// </summary>
     [JsonPropertyName("check_date")]
-    public DateTime? CheckDate { get; init; }
+    public DateTime? CheckDate { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/PolicyTypeEnum.cs b/src/Merge.Client/Hris/Types/PolicyTypeEnum.cs
index 34bb6864..c225ff54 100644
--- a/src/Merge.Client/Hris/Types/PolicyTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/PolicyTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/ReasonEnum.cs b/src/Merge.Client/Hris/Types/ReasonEnum.cs
index 554c430e..c39af6a2 100644
--- a/src/Merge.Client/Hris/Types/ReasonEnum.cs
+++ b/src/Merge.Client/Hris/Types/ReasonEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/RelationshipEnum.cs b/src/Merge.Client/Hris/Types/RelationshipEnum.cs
index 1a45484c..850df5ef 100644
--- a/src/Merge.Client/Hris/Types/RelationshipEnum.cs
+++ b/src/Merge.Client/Hris/Types/RelationshipEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/RemoteData.cs b/src/Merge.Client/Hris/Types/RemoteData.cs
index fc5dcc31..94ebdc20 100644
--- a/src/Merge.Client/Hris/Types/RemoteData.cs
+++ b/src/Merge.Client/Hris/Types/RemoteData.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Hris;
 
-public class RemoteData
+public record RemoteData
 {
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("data")]
-    public object? Data { get; init; }
+    public object? Data { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/RemoteEndpointInfo.cs b/src/Merge.Client/Hris/Types/RemoteEndpointInfo.cs
index a1438f3e..21738c9f 100644
--- a/src/Merge.Client/Hris/Types/RemoteEndpointInfo.cs
+++ b/src/Merge.Client/Hris/Types/RemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Hris;
 
-public class RemoteEndpointInfo
+public record RemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string UrlPath { get; init; }
+    public required string UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<object> FieldTraversalPath { get; init; }
+    public IEnumerable<object> FieldTraversalPath { get; set; } = new List<object>();
 }
diff --git a/src/Merge.Client/Hris/Types/RemoteFieldApi.cs b/src/Merge.Client/Hris/Types/RemoteFieldApi.cs
index 7079ede0..a9903736 100644
--- a/src/Merge.Client/Hris/Types/RemoteFieldApi.cs
+++ b/src/Merge.Client/Hris/Types/RemoteFieldApi.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class RemoteFieldApi
+public record RemoteFieldApi
 {
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("remote_endpoint_info")]
-    public RemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required RemoteEndpointInfo RemoteEndpointInfo { get; set; }
 
     [JsonPropertyName("example_values")]
-    public IEnumerable<object>? ExampleValues { get; init; }
+    public IEnumerable<object>? ExampleValues { get; set; }
 
     [JsonPropertyName("advanced_metadata")]
-    public AdvancedMetadata? AdvancedMetadata { get; init; }
+    public AdvancedMetadata? AdvancedMetadata { get; set; }
 
     [JsonPropertyName("coverage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<int, double>>))]
-    public OneOf<int, double>? Coverage { get; init; }
+    public OneOf<int, double>? Coverage { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/RemoteFieldApiResponse.cs b/src/Merge.Client/Hris/Types/RemoteFieldApiResponse.cs
index ff2feb28..e3661d1d 100644
--- a/src/Merge.Client/Hris/Types/RemoteFieldApiResponse.cs
+++ b/src/Merge.Client/Hris/Types/RemoteFieldApiResponse.cs
@@ -1,57 +1,56 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class RemoteFieldApiResponse
+public record RemoteFieldApiResponse
 {
     [JsonPropertyName("Benefit")]
-    public IEnumerable<RemoteFieldApi>? Benefit { get; init; }
+    public IEnumerable<RemoteFieldApi>? Benefit { get; set; }
 
     [JsonPropertyName("EmployerBenefit")]
-    public IEnumerable<RemoteFieldApi>? EmployerBenefit { get; init; }
+    public IEnumerable<RemoteFieldApi>? EmployerBenefit { get; set; }
 
     [JsonPropertyName("Company")]
-    public IEnumerable<RemoteFieldApi>? Company { get; init; }
+    public IEnumerable<RemoteFieldApi>? Company { get; set; }
 
     [JsonPropertyName("EmployeePayrollRun")]
-    public IEnumerable<RemoteFieldApi>? EmployeePayrollRun { get; init; }
+    public IEnumerable<RemoteFieldApi>? EmployeePayrollRun { get; set; }
 
     [JsonPropertyName("Employee")]
-    public IEnumerable<RemoteFieldApi>? Employee { get; init; }
+    public IEnumerable<RemoteFieldApi>? Employee { get; set; }
 
     [JsonPropertyName("Employment")]
-    public IEnumerable<RemoteFieldApi>? Employment { get; init; }
+    public IEnumerable<RemoteFieldApi>? Employment { get; set; }
 
     [JsonPropertyName("Location")]
-    public IEnumerable<RemoteFieldApi>? Location { get; init; }
+    public IEnumerable<RemoteFieldApi>? Location { get; set; }
 
     [JsonPropertyName("PayrollRun")]
-    public IEnumerable<RemoteFieldApi>? PayrollRun { get; init; }
+    public IEnumerable<RemoteFieldApi>? PayrollRun { get; set; }
 
     [JsonPropertyName("Team")]
-    public IEnumerable<RemoteFieldApi>? Team { get; init; }
+    public IEnumerable<RemoteFieldApi>? Team { get; set; }
 
     [JsonPropertyName("TimeOff")]
-    public IEnumerable<RemoteFieldApi>? TimeOff { get; init; }
+    public IEnumerable<RemoteFieldApi>? TimeOff { get; set; }
 
     [JsonPropertyName("TimeOffBalance")]
-    public IEnumerable<RemoteFieldApi>? TimeOffBalance { get; init; }
+    public IEnumerable<RemoteFieldApi>? TimeOffBalance { get; set; }
 
     [JsonPropertyName("BankInfo")]
-    public IEnumerable<RemoteFieldApi>? BankInfo { get; init; }
+    public IEnumerable<RemoteFieldApi>? BankInfo { get; set; }
 
     [JsonPropertyName("PayGroup")]
-    public IEnumerable<RemoteFieldApi>? PayGroup { get; init; }
+    public IEnumerable<RemoteFieldApi>? PayGroup { get; set; }
 
     [JsonPropertyName("Group")]
-    public IEnumerable<RemoteFieldApi>? Group { get; init; }
+    public IEnumerable<RemoteFieldApi>? Group { get; set; }
 
     [JsonPropertyName("Dependent")]
-    public IEnumerable<RemoteFieldApi>? Dependent { get; init; }
+    public IEnumerable<RemoteFieldApi>? Dependent { get; set; }
 
     [JsonPropertyName("TimesheetEntry")]
-    public IEnumerable<RemoteFieldApi>? TimesheetEntry { get; init; }
+    public IEnumerable<RemoteFieldApi>? TimesheetEntry { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/RemoteKey.cs b/src/Merge.Client/Hris/Types/RemoteKey.cs
index cfa92123..8bf25ebd 100644
--- a/src/Merge.Client/Hris/Types/RemoteKey.cs
+++ b/src/Merge.Client/Hris/Types/RemoteKey.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Hris;
 
-public class RemoteKey
+public record RemoteKey
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("key")]
-    public string Key { get; init; }
+    public required string Key { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/RemoteResponse.cs b/src/Merge.Client/Hris/Types/RemoteResponse.cs
index 6dbc3e81..c1777a2c 100644
--- a/src/Merge.Client/Hris/Types/RemoteResponse.cs
+++ b/src/Merge.Client/Hris/Types/RemoteResponse.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class RemoteResponse
+public record RemoteResponse
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("status")]
-    public int Status { get; init; }
+    public required int Status { get; set; }
 
     [JsonPropertyName("response")]
-    public object Response { get; init; }
+    public required object Response { get; set; }
 
     [JsonPropertyName("response_headers")]
-    public Dictionary<string, object>? ResponseHeaders { get; init; }
+    public Dictionary<string, object?>? ResponseHeaders { get; set; }
 
     [JsonPropertyName("response_type")]
-    public ResponseTypeEnum? ResponseType { get; init; }
+    public ResponseTypeEnum? ResponseType { get; set; }
 
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/RequestFormatEnum.cs b/src/Merge.Client/Hris/Types/RequestFormatEnum.cs
index 6522cc32..88f9bba9 100644
--- a/src/Merge.Client/Hris/Types/RequestFormatEnum.cs
+++ b/src/Merge.Client/Hris/Types/RequestFormatEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/RequestTypeEnum.cs b/src/Merge.Client/Hris/Types/RequestTypeEnum.cs
index 381c282a..bac23b36 100644
--- a/src/Merge.Client/Hris/Types/RequestTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/RequestTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/ResponseTypeEnum.cs b/src/Merge.Client/Hris/Types/ResponseTypeEnum.cs
index c1ba7308..cc51856c 100644
--- a/src/Merge.Client/Hris/Types/ResponseTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/ResponseTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/RoleEnum.cs b/src/Merge.Client/Hris/Types/RoleEnum.cs
index 0d2904c8..3fe43bfa 100644
--- a/src/Merge.Client/Hris/Types/RoleEnum.cs
+++ b/src/Merge.Client/Hris/Types/RoleEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/RunStateEnum.cs b/src/Merge.Client/Hris/Types/RunStateEnum.cs
index c92601cb..55a6246d 100644
--- a/src/Merge.Client/Hris/Types/RunStateEnum.cs
+++ b/src/Merge.Client/Hris/Types/RunStateEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/RunTypeEnum.cs b/src/Merge.Client/Hris/Types/RunTypeEnum.cs
index 9a7bb606..ad0ea5a4 100644
--- a/src/Merge.Client/Hris/Types/RunTypeEnum.cs
+++ b/src/Merge.Client/Hris/Types/RunTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/SelectiveSyncConfigurationsUsageEnum.cs b/src/Merge.Client/Hris/Types/SelectiveSyncConfigurationsUsageEnum.cs
index 058501e9..40b6f08b 100644
--- a/src/Merge.Client/Hris/Types/SelectiveSyncConfigurationsUsageEnum.cs
+++ b/src/Merge.Client/Hris/Types/SelectiveSyncConfigurationsUsageEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/SyncStatus.cs b/src/Merge.Client/Hris/Types/SyncStatus.cs
index 86d08a21..9d69d9a3 100644
--- a/src/Merge.Client/Hris/Types/SyncStatus.cs
+++ b/src/Merge.Client/Hris/Types/SyncStatus.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class SyncStatus
+public record SyncStatus
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("last_sync_start")]
-    public DateTime? LastSyncStart { get; init; }
+    public DateTime? LastSyncStart { get; set; }
 
     [JsonPropertyName("next_sync_start")]
-    public DateTime? NextSyncStart { get; init; }
+    public DateTime? NextSyncStart { get; set; }
 
     [JsonPropertyName("status")]
-    public SyncStatusStatusEnum Status { get; init; }
+    public required SyncStatusStatusEnum Status { get; set; }
 
     [JsonPropertyName("is_initial_sync")]
-    public bool IsInitialSync { get; init; }
+    public required bool IsInitialSync { get; set; }
 
     [JsonPropertyName("selective_sync_configurations_usage")]
-    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; init; }
+    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/SyncStatusStatusEnum.cs b/src/Merge.Client/Hris/Types/SyncStatusStatusEnum.cs
index e8c54ae0..9cf1b6f9 100644
--- a/src/Merge.Client/Hris/Types/SyncStatusStatusEnum.cs
+++ b/src/Merge.Client/Hris/Types/SyncStatusStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/Tax.cs b/src/Merge.Client/Hris/Types/Tax.cs
index 1512271b..87fe8589 100644
--- a/src/Merge.Client/Hris/Types/Tax.cs
+++ b/src/Merge.Client/Hris/Types/Tax.cs
@@ -1,63 +1,62 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Tax
+public record Tax
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("employee_payroll_run")]
-    public string? EmployeePayrollRun { get; init; }
+    public string? EmployeePayrollRun { get; set; }
 
     /// <summary>
     /// The tax's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The tax amount.
     /// </summary>
     [JsonPropertyName("amount")]
-    public double? Amount { get; init; }
+    public double? Amount { get; set; }
 
     /// <summary>
     /// Whether or not the employer is responsible for paying the tax.
     /// </summary>
     [JsonPropertyName("employer_tax")]
-    public bool? EmployerTax { get; init; }
+    public bool? EmployerTax { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/Team.cs b/src/Merge.Client/Hris/Types/Team.cs
index 13d944e2..e29710e1 100644
--- a/src/Merge.Client/Hris/Types/Team.cs
+++ b/src/Merge.Client/Hris/Types/Team.cs
@@ -1,57 +1,56 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class Team
+public record Team
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The team's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The team's parent team.
     /// </summary>
     [JsonPropertyName("parent_team")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Team>>))]
-    public OneOf<string, Team>? ParentTeam { get; init; }
+    public OneOf<string, Team>? ParentTeam { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/TimeOff.cs b/src/Merge.Client/Hris/Types/TimeOff.cs
index ce31c9cd..a136dff4 100644
--- a/src/Merge.Client/Hris/Types/TimeOff.cs
+++ b/src/Merge.Client/Hris/Types/TimeOff.cs
@@ -1,48 +1,47 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class TimeOff
+public record TimeOff
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The employee requesting time off.
     /// </summary>
     [JsonPropertyName("employee")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Employee { get; init; }
+    public OneOf<string, Employee>? Employee { get; set; }
 
     /// <summary>
     /// The Merge ID of the employee with the ability to approve the time off request.
     /// </summary>
     [JsonPropertyName("approver")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Approver { get; init; }
+    public OneOf<string, Employee>? Approver { get; set; }
 
     /// <summary>
     /// The status of this time off request.
@@ -54,13 +53,13 @@ public class TimeOff
     /// - `DELETED` - DELETED
     /// </summary>
     [JsonPropertyName("status")]
-    public TimeOffStatusEnum? Status { get; init; }
+    public TimeOffStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The employee note for this time off request.
     /// </summary>
     [JsonPropertyName("employee_note")]
-    public string? EmployeeNote { get; init; }
+    public string? EmployeeNote { get; set; }
 
     /// <summary>
     /// The measurement that the third-party integration uses to count time requested.
@@ -69,13 +68,13 @@ public class TimeOff
     /// - `DAYS` - DAYS
     /// </summary>
     [JsonPropertyName("units")]
-    public UnitsEnum? Units { get; init; }
+    public UnitsEnum? Units { get; set; }
 
     /// <summary>
     /// The time off quantity measured by the prescribed “units”.
     /// </summary>
     [JsonPropertyName("amount")]
-    public double? Amount { get; init; }
+    public double? Amount { get; set; }
 
     /// <summary>
     /// The type of time off request.
@@ -88,26 +87,26 @@ public class TimeOff
     /// - `BEREAVEMENT` - BEREAVEMENT
     /// </summary>
     [JsonPropertyName("request_type")]
-    public RequestTypeEnum? RequestType { get; init; }
+    public RequestTypeEnum? RequestType { get; set; }
 
     /// <summary>
     /// The day and time of the start of the time requested off.
     /// </summary>
     [JsonPropertyName("start_time")]
-    public DateTime? StartTime { get; init; }
+    public DateTime? StartTime { get; set; }
 
     /// <summary>
     /// The day and time of the end of the time requested off.
     /// </summary>
     [JsonPropertyName("end_time")]
-    public DateTime? EndTime { get; init; }
+    public DateTime? EndTime { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/TimeOffBalance.cs b/src/Merge.Client/Hris/Types/TimeOffBalance.cs
index a59f8730..84bdf6ec 100644
--- a/src/Merge.Client/Hris/Types/TimeOffBalance.cs
+++ b/src/Merge.Client/Hris/Types/TimeOffBalance.cs
@@ -1,53 +1,52 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class TimeOffBalance
+public record TimeOffBalance
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The employee the balance belongs to.
     /// </summary>
     [JsonPropertyName("employee")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Employee { get; init; }
+    public OneOf<string, Employee>? Employee { get; set; }
 
     /// <summary>
     /// The current remaining PTO balance, always measured in terms of hours.
     /// </summary>
     [JsonPropertyName("balance")]
-    public double? Balance { get; init; }
+    public double? Balance { get; set; }
 
     /// <summary>
     /// The amount of PTO used in terms of hours.
     /// </summary>
     [JsonPropertyName("used")]
-    public double? Used { get; init; }
+    public double? Used { get; set; }
 
     /// <summary>
     /// The policy type of this time off balance.
@@ -60,17 +59,17 @@ public class TimeOffBalance
     /// - `BEREAVEMENT` - BEREAVEMENT
     /// </summary>
     [JsonPropertyName("policy_type")]
-    public PolicyTypeEnum? PolicyType { get; init; }
+    public PolicyTypeEnum? PolicyType { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/TimeOffRequest.cs b/src/Merge.Client/Hris/Types/TimeOffRequest.cs
index c2c334f9..4bbe2e69 100644
--- a/src/Merge.Client/Hris/Types/TimeOffRequest.cs
+++ b/src/Merge.Client/Hris/Types/TimeOffRequest.cs
@@ -1,27 +1,26 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class TimeOffRequest
+public record TimeOffRequest
 {
     /// <summary>
     /// The employee requesting time off.
     /// </summary>
     [JsonPropertyName("employee")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Employee { get; init; }
+    public OneOf<string, Employee>? Employee { get; set; }
 
     /// <summary>
     /// The Merge ID of the employee with the ability to approve the time off request.
     /// </summary>
     [JsonPropertyName("approver")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Employee>>))]
-    public OneOf<string, Employee>? Approver { get; init; }
+    public OneOf<string, Employee>? Approver { get; set; }
 
     /// <summary>
     /// The status of this time off request.
@@ -33,13 +32,13 @@ public class TimeOffRequest
     /// - `DELETED` - DELETED
     /// </summary>
     [JsonPropertyName("status")]
-    public TimeOffStatusEnum? Status { get; init; }
+    public TimeOffStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The employee note for this time off request.
     /// </summary>
     [JsonPropertyName("employee_note")]
-    public string? EmployeeNote { get; init; }
+    public string? EmployeeNote { get; set; }
 
     /// <summary>
     /// The measurement that the third-party integration uses to count time requested.
@@ -48,13 +47,13 @@ public class TimeOffRequest
     /// - `DAYS` - DAYS
     /// </summary>
     [JsonPropertyName("units")]
-    public UnitsEnum? Units { get; init; }
+    public UnitsEnum? Units { get; set; }
 
     /// <summary>
     /// The time off quantity measured by the prescribed “units”.
     /// </summary>
     [JsonPropertyName("amount")]
-    public double? Amount { get; init; }
+    public double? Amount { get; set; }
 
     /// <summary>
     /// The type of time off request.
@@ -67,23 +66,23 @@ public class TimeOffRequest
     /// - `BEREAVEMENT` - BEREAVEMENT
     /// </summary>
     [JsonPropertyName("request_type")]
-    public RequestTypeEnum? RequestType { get; init; }
+    public RequestTypeEnum? RequestType { get; set; }
 
     /// <summary>
     /// The day and time of the start of the time requested off.
     /// </summary>
     [JsonPropertyName("start_time")]
-    public DateTime? StartTime { get; init; }
+    public DateTime? StartTime { get; set; }
 
     /// <summary>
     /// The day and time of the end of the time requested off.
     /// </summary>
     [JsonPropertyName("end_time")]
-    public DateTime? EndTime { get; init; }
+    public DateTime? EndTime { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/TimeOffResponse.cs b/src/Merge.Client/Hris/Types/TimeOffResponse.cs
index 4be5270c..4d70f5b6 100644
--- a/src/Merge.Client/Hris/Types/TimeOffResponse.cs
+++ b/src/Merge.Client/Hris/Types/TimeOffResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class TimeOffResponse
+public record TimeOffResponse
 {
     [JsonPropertyName("model")]
-    public TimeOff Model { get; init; }
+    public required TimeOff Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/TimeOffStatusEnum.cs b/src/Merge.Client/Hris/Types/TimeOffStatusEnum.cs
index fba74e83..202e931a 100644
--- a/src/Merge.Client/Hris/Types/TimeOffStatusEnum.cs
+++ b/src/Merge.Client/Hris/Types/TimeOffStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/TimesheetEntry.cs b/src/Merge.Client/Hris/Types/TimesheetEntry.cs
index 005c66cc..335b0a5a 100644
--- a/src/Merge.Client/Hris/Types/TimesheetEntry.cs
+++ b/src/Merge.Client/Hris/Types/TimesheetEntry.cs
@@ -4,62 +4,62 @@
 
 namespace Merge.Client.Hris;
 
-public class TimesheetEntry
+public record TimesheetEntry
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The employee the timesheet entry is for.
     /// </summary>
     [JsonPropertyName("employee")]
-    public string? Employee { get; init; }
+    public string? Employee { get; set; }
 
     /// <summary>
     /// The number of hours logged by the employee.
     /// </summary>
     [JsonPropertyName("hours_worked")]
-    public double? HoursWorked { get; init; }
+    public double? HoursWorked { get; set; }
 
     /// <summary>
     /// The time at which the employee started work.
     /// </summary>
     [JsonPropertyName("start_time")]
-    public DateTime? StartTime { get; init; }
+    public DateTime? StartTime { get; set; }
 
     /// <summary>
     /// The time at which the employee ended work.
     /// </summary>
     [JsonPropertyName("end_time")]
-    public DateTime? EndTime { get; init; }
+    public DateTime? EndTime { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<Dictionary<string, object>>? RemoteData { get; init; }
+    public IEnumerable<Dictionary<string, object?>>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/TimesheetEntryRequest.cs b/src/Merge.Client/Hris/Types/TimesheetEntryRequest.cs
index 25c451bd..3d167aa6 100644
--- a/src/Merge.Client/Hris/Types/TimesheetEntryRequest.cs
+++ b/src/Merge.Client/Hris/Types/TimesheetEntryRequest.cs
@@ -4,35 +4,35 @@
 
 namespace Merge.Client.Hris;
 
-public class TimesheetEntryRequest
+public record TimesheetEntryRequest
 {
     /// <summary>
     /// The employee the timesheet entry is for.
     /// </summary>
     [JsonPropertyName("employee")]
-    public string? Employee { get; init; }
+    public string? Employee { get; set; }
 
     /// <summary>
     /// The number of hours logged by the employee.
     /// </summary>
     [JsonPropertyName("hours_worked")]
-    public double? HoursWorked { get; init; }
+    public double? HoursWorked { get; set; }
 
     /// <summary>
     /// The time at which the employee started work.
     /// </summary>
     [JsonPropertyName("start_time")]
-    public DateTime? StartTime { get; init; }
+    public DateTime? StartTime { get; set; }
 
     /// <summary>
     /// The time at which the employee ended work.
     /// </summary>
     [JsonPropertyName("end_time")]
-    public DateTime? EndTime { get; init; }
+    public DateTime? EndTime { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/TimesheetEntryResponse.cs b/src/Merge.Client/Hris/Types/TimesheetEntryResponse.cs
index 096636f3..49b312f6 100644
--- a/src/Merge.Client/Hris/Types/TimesheetEntryResponse.cs
+++ b/src/Merge.Client/Hris/Types/TimesheetEntryResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class TimesheetEntryResponse
+public record TimesheetEntryResponse
 {
     [JsonPropertyName("model")]
-    public TimesheetEntry Model { get; init; }
+    public required TimesheetEntry Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/UnitsEnum.cs b/src/Merge.Client/Hris/Types/UnitsEnum.cs
index 69abfbe4..e6a6b4dc 100644
--- a/src/Merge.Client/Hris/Types/UnitsEnum.cs
+++ b/src/Merge.Client/Hris/Types/UnitsEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Hris;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Hris/Types/ValidationProblemSource.cs b/src/Merge.Client/Hris/Types/ValidationProblemSource.cs
index 6ece4026..996c4902 100644
--- a/src/Merge.Client/Hris/Types/ValidationProblemSource.cs
+++ b/src/Merge.Client/Hris/Types/ValidationProblemSource.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Hris;
 
-public class ValidationProblemSource
+public record ValidationProblemSource
 {
     [JsonPropertyName("pointer")]
-    public string Pointer { get; init; }
+    public required string Pointer { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/WarningValidationProblem.cs b/src/Merge.Client/Hris/Types/WarningValidationProblem.cs
index e50f6b26..154b4e72 100644
--- a/src/Merge.Client/Hris/Types/WarningValidationProblem.cs
+++ b/src/Merge.Client/Hris/Types/WarningValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Hris;
 
 #nullable enable
 
 namespace Merge.Client.Hris;
 
-public class WarningValidationProblem
+public record WarningValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Hris/Types/WebhookReceiver.cs b/src/Merge.Client/Hris/Types/WebhookReceiver.cs
index 1593691a..5edf540b 100644
--- a/src/Merge.Client/Hris/Types/WebhookReceiver.cs
+++ b/src/Merge.Client/Hris/Types/WebhookReceiver.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Hris;
 
-public class WebhookReceiver
+public record WebhookReceiver
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Hris/WebhookReceivers/Requests/WebhookReceiverRequest.cs b/src/Merge.Client/Hris/WebhookReceivers/Requests/WebhookReceiverRequest.cs
index 54722558..8b365291 100644
--- a/src/Merge.Client/Hris/WebhookReceivers/Requests/WebhookReceiverRequest.cs
+++ b/src/Merge.Client/Hris/WebhookReceivers/Requests/WebhookReceiverRequest.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Hris;
 
-public class WebhookReceiverRequest
+public record WebhookReceiverRequest
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Hris/WebhookReceivers/WebhookReceiversClient.cs b/src/Merge.Client/Hris/WebhookReceivers/WebhookReceiversClient.cs
index 06b7f302..2bcf82fe 100644
--- a/src/Merge.Client/Hris/WebhookReceivers/WebhookReceiversClient.cs
+++ b/src/Merge.Client/Hris/WebhookReceivers/WebhookReceiversClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Hris;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,72 @@ public WebhookReceiversClient(RawClient client)
     /// <summary>
     /// Returns a list of `WebhookReceiver` objects.
     /// </summary>
-    public async Task<IEnumerable<WebhookReceiver>> ListAsync()
+    public async Task<IEnumerable<WebhookReceiver>> ListAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "hris/v1/webhook-receivers"
+                Path = "hris/v1/webhook-receivers",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<WebhookReceiver>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<WebhookReceiver>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `WebhookReceiver` object with the given values.
     /// </summary>
-    public async Task<WebhookReceiver> CreateAsync(WebhookReceiverRequest request)
+    public async Task<WebhookReceiver> CreateAsync(
+        WebhookReceiverRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "hris/v1/webhook-receivers",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<WebhookReceiver>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<WebhookReceiver>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Merge.Client.csproj b/src/Merge.Client/Merge.Client.csproj
index 85287d57..8bca6ff3 100644
--- a/src/Merge.Client/Merge.Client.csproj
+++ b/src/Merge.Client/Merge.Client.csproj
@@ -1,19 +1,41 @@
-
+ 
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net7.0;net6.0;</TargetFrameworks>
+        <TargetFrameworks>net462;net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <NuGetAudit>false</NuGetAudit>
-        <Version>0.1.0</Version>
+        <LangVersion>12</LangVersion>
+        <Nullable>enable</Nullable>
+        <Version>0.2.0</Version>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <PackageProjectUrl>https://github.com/merge-api/merge-csharp-client</PackageProjectUrl>
     </PropertyGroup>
+    
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
+        <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
+    </PropertyGroup>
+    
+    <ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
+        <PackageReference Include="Portable.System.DateTimeOnly" Version="8.0.1" />
+    </ItemGroup>
+    
+    <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+        <Reference Include="System.Net.Http" />
+    </ItemGroup>
+    
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
+        <PackageReference Include="PolySharp" Version="1.14.1">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="OneOf" Version="3.0.263" />
-        <PackageReference Include="System.Text.Json" Version="8.0.3" />
+        <PackageReference Include="OneOf.Extended" Version="3.0.263" />
+        <PackageReference Include="System.Text.Json" Version="8.0.4" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Merge.Client/Merge.cs b/src/Merge.Client/Merge.cs
index cb6030ec..ca9e74aa 100644
--- a/src/Merge.Client/Merge.cs
+++ b/src/Merge.Client/Merge.cs
@@ -1,6 +1,7 @@
-using Merge.Client;
+using System;
 using Merge.Client.Accounting;
 using Merge.Client.Ats;
+using Merge.Client.Core;
 using Merge.Client.Crm;
 using Merge.Client.Filestorage;
 using Merge.Client.Hris;
@@ -15,9 +16,9 @@ public partial class Merge
     private RawClient _client;
 
     public Merge(
-        string apiKey = null,
+        string? apiKey = null,
         string? accountToken = null,
-        ClientOptions clientOptions = null
+        ClientOptions? clientOptions = null
     )
     {
         _client = new RawClient(
@@ -27,37 +28,28 @@ public Merge(
                 { "X-Account-Token", accountToken },
                 { "X-Fern-Language", "C#" },
                 { "X-Fern-SDK-Name", "Merge.Client" },
-                { "X-Fern-SDK-Version", "0.1.0" },
+                { "X-Fern-SDK-Version", "0.2.0" },
             },
+            new Dictionary<string, Func<string>>() { },
             clientOptions ?? new ClientOptions()
         );
+        Filestorage = new FilestorageClient(_client);
         Ats = new AtsClient(_client);
         Crm = new CrmClient(_client);
-        Filestorage = new FilestorageClient(_client);
-        Ticketing = new TicketingClient(_client);
         Hris = new HrisClient(_client);
+        Ticketing = new TicketingClient(_client);
         Accounting = new AccountingClient(_client);
     }
 
-    public AtsClient Ats { get; }
+    public FilestorageClient Filestorage { get; init; }
 
-    public CrmClient Crm { get; }
+    public AtsClient Ats { get; init; }
 
-    public FilestorageClient Filestorage { get; }
+    public CrmClient Crm { get; init; }
 
-    public TicketingClient Ticketing { get; }
+    public HrisClient Hris { get; init; }
 
-    public HrisClient Hris { get; }
+    public TicketingClient Ticketing { get; init; }
 
-    public AccountingClient Accounting { get; }
-
-    private string GetFromEnvironmentOrThrow(string env, string message)
-    {
-        var value = System.Environment.GetEnvironmentVariable(env);
-        if (value == null)
-        {
-            throw new Exception(message);
-        }
-        return value;
-    }
+    public AccountingClient Accounting { get; init; }
 }
diff --git a/src/Merge.Client/Ticketing/AccountDetails/AccountDetailsClient.cs b/src/Merge.Client/Ticketing/AccountDetails/AccountDetailsClient.cs
index f2fea22d..82e357fb 100644
--- a/src/Merge.Client/Ticketing/AccountDetails/AccountDetailsClient.cs
+++ b/src/Merge.Client/Ticketing/AccountDetails/AccountDetailsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AccountDetailsClient(RawClient client)
     /// <summary>
     /// Get details for a linked account.
     /// </summary>
-    public async Task<AccountDetails> RetrieveAsync()
+    public async Task<AccountDetails> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/account-details"
+                Path = "ticketing/v1/account-details",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountDetails>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountDetails>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/AccountToken/AccountTokenClient.cs b/src/Merge.Client/Ticketing/AccountToken/AccountTokenClient.cs
index 74a43715..ff4041d1 100644
--- a/src/Merge.Client/Ticketing/AccountToken/AccountTokenClient.cs
+++ b/src/Merge.Client/Ticketing/AccountToken/AccountTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,37 @@ public AccountTokenClient(RawClient client)
     /// <summary>
     /// Returns the account token for the end user with the provided public token.
     /// </summary>
-    public async Task<AccountToken> RetrieveAsync(string publicToken)
+    public async Task<AccountToken> RetrieveAsync(
+        string publicToken,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"ticketing/v1/account-token/{publicToken}"
+                Path = $"ticketing/v1/account-token/{publicToken}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AccountToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AccountToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Accounts/AccountsClient.cs b/src/Merge.Client/Ticketing/Accounts/AccountsClient.cs
index d521553a..b88fa0ca 100644
--- a/src/Merge.Client/Ticketing/Accounts/AccountsClient.cs
+++ b/src/Merge.Client/Ticketing/Accounts/AccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public AccountsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Account` objects.
     /// </summary>
-    public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
+    public async Task<PaginatedAccountList> ListAsync(
+        AccountsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedAccountList> ListAsync(AccountsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Account` object with the given `id`.
     /// </summary>
-    public async Task<Account> RetrieveAsync(string id, AccountsRetrieveRequest request)
+    public async Task<Account> RetrieveAsync(
+        string id,
+        AccountsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<Account> RetrieveAsync(string id, AccountsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/accounts/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Account>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Account>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Accounts/Requests/AccountsListRequest.cs b/src/Merge.Client/Ticketing/Accounts/Requests/AccountsListRequest.cs
index 2b4ff22f..80c825ec 100644
--- a/src/Merge.Client/Ticketing/Accounts/Requests/AccountsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Accounts/Requests/AccountsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ticketing;
 
-public class AccountsListRequest
+public record AccountsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Accounts/Requests/AccountsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Accounts/Requests/AccountsRetrieveRequest.cs
index 4a7a239d..24cceda9 100644
--- a/src/Merge.Client/Ticketing/Accounts/Requests/AccountsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Accounts/Requests/AccountsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ticketing;
 
-public class AccountsRetrieveRequest
+public record AccountsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/AsyncPassthrough/AsyncPassthroughClient.cs b/src/Merge.Client/Ticketing/AsyncPassthrough/AsyncPassthroughClient.cs
index 90db7cca..a6043bc2 100644
--- a/src/Merge.Client/Ticketing/AsyncPassthrough/AsyncPassthroughClient.cs
+++ b/src/Merge.Client/Ticketing/AsyncPassthrough/AsyncPassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,75 @@ public AsyncPassthroughClient(RawClient client)
     /// <summary>
     /// Asynchronously pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<AsyncPassthroughReciept> CreateAsync(DataPassthroughRequest request)
+    public async Task<AsyncPassthroughReciept> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/async-passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AsyncPassthroughReciept>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AsyncPassthroughReciept>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Retrieves data from earlier async-passthrough POST request
     /// </summary>
-    public async Task<RemoteResponse> RetrieveAsync(string asyncPassthroughReceiptId)
+    public async Task<RemoteResponse> RetrieveAsync(
+        string asyncPassthroughReceiptId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"ticketing/v1/async-passthrough/{asyncPassthroughReceiptId}"
+                Path = $"ticketing/v1/async-passthrough/{asyncPassthroughReceiptId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Attachments/AttachmentsClient.cs b/src/Merge.Client/Ticketing/Attachments/AttachmentsClient.cs
index 052e990f..15388ef8 100644
--- a/src/Merge.Client/Ticketing/Attachments/AttachmentsClient.cs
+++ b/src/Merge.Client/Ticketing/Attachments/AttachmentsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public AttachmentsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Attachment` objects.
     /// </summary>
-    public async Task<PaginatedAttachmentList> ListAsync(AttachmentsListRequest request)
+    public async Task<PaginatedAttachmentList> ListAsync(
+        AttachmentsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedAttachmentList> ListAsync(AttachmentsListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -59,7 +68,9 @@ public async Task<PaginatedAttachmentList> ListAsync(AttachmentsListRequest requ
         }
         if (request.RemoteCreatedAfter != null)
         {
-            _query["remote_created_after"] = request.RemoteCreatedAfter.Value.ToString("o0");
+            _query["remote_created_after"] = request.RemoteCreatedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.RemoteId != null)
         {
@@ -72,24 +83,39 @@ public async Task<PaginatedAttachmentList> ListAsync(AttachmentsListRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/attachments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAttachmentList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAttachmentList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates an `Attachment` object with the given values.
     /// </summary>
     public async Task<TicketingAttachmentResponse> CreateAsync(
-        TicketingAttachmentEndpointRequest request
+        TicketingAttachmentEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -104,23 +130,41 @@ TicketingAttachmentEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/attachments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TicketingAttachmentResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TicketingAttachmentResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns an `Attachment` object with the given `id`.
     /// </summary>
-    public async Task<Attachment> RetrieveAsync(string id, AttachmentsRetrieveRequest request)
+    public async Task<Attachment> RetrieveAsync(
+        string id,
+        AttachmentsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -134,23 +178,41 @@ public async Task<Attachment> RetrieveAsync(string id, AttachmentsRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/attachments/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Attachment>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Attachment>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns the `File` content with the given `id` as a stream of bytes.
     /// </summary>
-    public async void DownloadRetrieveAsync(string id, AttachmentsDownloadRetrieveRequest request)
+    public async Task DownloadRetrieveAsync(
+        string id,
+        AttachmentsDownloadRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.MimeType != null)
@@ -160,30 +222,52 @@ public async void DownloadRetrieveAsync(string id, AttachmentsDownloadRetrieveRe
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/attachments/{id}/download",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `TicketingAttachment` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/attachments/meta/post"
+                Path = "ticketing/v1/attachments/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsDownloadRetrieveRequest.cs b/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsDownloadRetrieveRequest.cs
index aae8df8e..deefb1de 100644
--- a/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsDownloadRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsDownloadRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ticketing;
 
-public class AttachmentsDownloadRetrieveRequest
+public record AttachmentsDownloadRetrieveRequest
 {
     /// <summary>
     /// If provided, specifies the export format of the file to be downloaded. For information on supported export formats, please refer to our <a href='https://help.merge.dev/en/articles/8615316-file-export-and-download-specification' target='_blank'>export format help center article</a>.
     /// </summary>
-    public string? MimeType { get; init; }
+    public string? MimeType { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsListRequest.cs b/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsListRequest.cs
index 1f596019..534dc3ad 100644
--- a/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsListRequest.cs
@@ -1,64 +1,64 @@
 namespace Merge.Client.Ticketing;
 
-public class AttachmentsListRequest
+public record AttachmentsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return attachments created in the third party platform after this datetime.
     /// </summary>
-    public DateTime? RemoteCreatedAfter { get; init; }
+    public DateTime? RemoteCreatedAfter { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return comments for this ticket.
     /// </summary>
-    public string? TicketId { get; init; }
+    public string? TicketId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsRetrieveRequest.cs
index ba666767..2777bb97 100644
--- a/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Attachments/Requests/AttachmentsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Ticketing;
 
-public class AttachmentsRetrieveRequest
+public record AttachmentsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Attachments/Requests/TicketingAttachmentEndpointRequest.cs b/src/Merge.Client/Ticketing/Attachments/Requests/TicketingAttachmentEndpointRequest.cs
index f35dfd62..284616e7 100644
--- a/src/Merge.Client/Ticketing/Attachments/Requests/TicketingAttachmentEndpointRequest.cs
+++ b/src/Merge.Client/Ticketing/Attachments/Requests/TicketingAttachmentEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class TicketingAttachmentEndpointRequest
+public record TicketingAttachmentEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public AttachmentRequest Model { get; init; }
+    public required AttachmentRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/AuditTrail/AuditTrailClient.cs b/src/Merge.Client/Ticketing/AuditTrail/AuditTrailClient.cs
index 8c8b17ab..5101b0b9 100644
--- a/src/Merge.Client/Ticketing/AuditTrail/AuditTrailClient.cs
+++ b/src/Merge.Client/Ticketing/AuditTrail/AuditTrailClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public AuditTrailClient(RawClient client)
     /// <summary>
     /// Gets a list of audit trail events.
     /// </summary>
-    public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest request)
+    public async Task<PaginatedAuditLogEventList> ListAsync(
+        AuditTrailListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -48,16 +51,30 @@ public async Task<PaginatedAuditLogEventList> ListAsync(AuditTrailListRequest re
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/audit-trail",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAuditLogEventList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAuditLogEventList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/AuditTrail/Requests/AuditTrailListRequest.cs b/src/Merge.Client/Ticketing/AuditTrail/Requests/AuditTrailListRequest.cs
index 0d2d3fce..c4087def 100644
--- a/src/Merge.Client/Ticketing/AuditTrail/Requests/AuditTrailListRequest.cs
+++ b/src/Merge.Client/Ticketing/AuditTrail/Requests/AuditTrailListRequest.cs
@@ -1,34 +1,34 @@
 namespace Merge.Client.Ticketing;
 
-public class AuditTrailListRequest
+public record AuditTrailListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
     /// <summary>
     /// If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`, `END_USER_CREDENTIALS_ACCESSED`
     /// </summary>
-    public string? EventType { get; init; }
+    public string? EventType { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include audit trail events that occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// If provided, this will return events associated with the specified user email. Please note that the email address reflects the user's email at the time of the event, and may not be their current email.
     /// </summary>
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/AvailableActions/AvailableActionsClient.cs b/src/Merge.Client/Ticketing/AvailableActions/AvailableActionsClient.cs
index 4e83c87a..73bb0c60 100644
--- a/src/Merge.Client/Ticketing/AvailableActions/AvailableActionsClient.cs
+++ b/src/Merge.Client/Ticketing/AvailableActions/AvailableActionsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,34 @@ public AvailableActionsClient(RawClient client)
     /// <summary>
     /// Returns a list of models and actions available for an account.
     /// </summary>
-    public async Task<AvailableActions> RetrieveAsync()
+    public async Task<AvailableActions> RetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/available-actions"
+                Path = "ticketing/v1/available-actions",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<AvailableActions>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<AvailableActions>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Collections/CollectionsClient.cs b/src/Merge.Client/Ticketing/Collections/CollectionsClient.cs
index 1e6e3e25..8df765e9 100644
--- a/src/Merge.Client/Ticketing/Collections/CollectionsClient.cs
+++ b/src/Merge.Client/Ticketing/Collections/CollectionsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public CollectionsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Collection` objects.
     /// </summary>
-    public async Task<PaginatedCollectionList> ListAsync(CollectionsListRequest request)
+    public async Task<PaginatedCollectionList> ListAsync(
+        CollectionsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CollectionType != null)
@@ -27,11 +30,13 @@ public async Task<PaginatedCollectionList> ListAsync(CollectionsListRequest requ
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedCollectionList> ListAsync(CollectionsListRequest requ
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -80,23 +89,41 @@ public async Task<PaginatedCollectionList> ListAsync(CollectionsListRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/collections",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCollectionList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCollectionList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Collection` object with the given `id`.
     /// </summary>
-    public async Task<Collection> RetrieveAsync(string id, CollectionsRetrieveRequest request)
+    public async Task<Collection> RetrieveAsync(
+        string id,
+        CollectionsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -118,17 +145,31 @@ public async Task<Collection> RetrieveAsync(string id, CollectionsRetrieveReques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/collections/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Collection>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Collection>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -136,7 +177,8 @@ public async Task<Collection> RetrieveAsync(string id, CollectionsRetrieveReques
     /// </summary>
     public async Task<PaginatedUserList> UsersListAsync(
         string parentId,
-        CollectionsUsersListRequest request
+        CollectionsUsersListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -163,16 +205,30 @@ CollectionsUsersListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/collections/{parentId}/users",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedUserList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedUserList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Collections/Requests/CollectionsListRequest.cs b/src/Merge.Client/Ticketing/Collections/Requests/CollectionsListRequest.cs
index 42e46e1b..ec690b3a 100644
--- a/src/Merge.Client/Ticketing/Collections/Requests/CollectionsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Collections/Requests/CollectionsListRequest.cs
@@ -1,74 +1,74 @@
 namespace Merge.Client.Ticketing;
 
-public class CollectionsListRequest
+public record CollectionsListRequest
 {
     /// <summary>
     /// If provided, will only return collections of the given type.
     /// </summary>
-    public string? CollectionType { get; init; }
+    public string? CollectionType { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return collections whose parent collection matches the given id.
     /// </summary>
-    public string? ParentCollectionId { get; init; }
+    public string? ParentCollectionId { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Collections/Requests/CollectionsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Collections/Requests/CollectionsRetrieveRequest.cs
index e706c385..132cfbc0 100644
--- a/src/Merge.Client/Ticketing/Collections/Requests/CollectionsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Collections/Requests/CollectionsRetrieveRequest.cs
@@ -1,24 +1,24 @@
 namespace Merge.Client.Ticketing;
 
-public class CollectionsRetrieveRequest
+public record CollectionsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public string? RemoteFields { get; init; }
+    public string? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public string? ShowEnumOrigins { get; init; }
+    public string? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Collections/Requests/CollectionsUsersListRequest.cs b/src/Merge.Client/Ticketing/Collections/Requests/CollectionsUsersListRequest.cs
index 8573dd3d..0a593cbc 100644
--- a/src/Merge.Client/Ticketing/Collections/Requests/CollectionsUsersListRequest.cs
+++ b/src/Merge.Client/Ticketing/Collections/Requests/CollectionsUsersListRequest.cs
@@ -1,33 +1,29 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class CollectionsUsersListRequest
+public record CollectionsUsersListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CollectionsUsersListRequestExpand? Expand { get; init; }
+    public CollectionsUsersListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Collections/Types/CollectionsUsersListRequestExpand.cs b/src/Merge.Client/Ticketing/Collections/Types/CollectionsUsersListRequestExpand.cs
index 54bf16b6..b4560665 100644
--- a/src/Merge.Client/Ticketing/Collections/Types/CollectionsUsersListRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Collections/Types/CollectionsUsersListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Comments/CommentsClient.cs b/src/Merge.Client/Ticketing/Comments/CommentsClient.cs
index d353ca2a..17dfb339 100644
--- a/src/Merge.Client/Ticketing/Comments/CommentsClient.cs
+++ b/src/Merge.Client/Ticketing/Comments/CommentsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public CommentsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Comment` objects.
     /// </summary>
-    public async Task<PaginatedCommentList> ListAsync(CommentsListRequest request)
+    public async Task<PaginatedCommentList> ListAsync(
+        CommentsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedCommentList> ListAsync(CommentsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -59,7 +68,9 @@ public async Task<PaginatedCommentList> ListAsync(CommentsListRequest request)
         }
         if (request.RemoteCreatedAfter != null)
         {
-            _query["remote_created_after"] = request.RemoteCreatedAfter.Value.ToString("o0");
+            _query["remote_created_after"] = request.RemoteCreatedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.RemoteId != null)
         {
@@ -72,23 +83,40 @@ public async Task<PaginatedCommentList> ListAsync(CommentsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/comments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedCommentList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedCommentList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Comment` object with the given values.
     /// </summary>
-    public async Task<CommentResponse> CreateAsync(CommentEndpointRequest request)
+    public async Task<CommentResponse> CreateAsync(
+        CommentEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -102,23 +130,41 @@ public async Task<CommentResponse> CreateAsync(CommentEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/comments",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommentResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommentResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Comment` object with the given `id`.
     /// </summary>
-    public async Task<Comment> RetrieveAsync(string id, CommentsRetrieveRequest request)
+    public async Task<Comment> RetrieveAsync(
+        string id,
+        CommentsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -132,36 +178,64 @@ public async Task<Comment> RetrieveAsync(string id, CommentsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/comments/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Comment>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Comment>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Comment` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/comments/meta/post"
+                Path = "ticketing/v1/comments/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Comments/Requests/CommentEndpointRequest.cs b/src/Merge.Client/Ticketing/Comments/Requests/CommentEndpointRequest.cs
index 1d4875c7..8a9ff8ec 100644
--- a/src/Merge.Client/Ticketing/Comments/Requests/CommentEndpointRequest.cs
+++ b/src/Merge.Client/Ticketing/Comments/Requests/CommentEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class CommentEndpointRequest
+public record CommentEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public CommentRequest Model { get; init; }
+    public required CommentRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Comments/Requests/CommentsListRequest.cs b/src/Merge.Client/Ticketing/Comments/Requests/CommentsListRequest.cs
index 2d6bfd81..cc90874e 100644
--- a/src/Merge.Client/Ticketing/Comments/Requests/CommentsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Comments/Requests/CommentsListRequest.cs
@@ -1,68 +1,64 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class CommentsListRequest
+public record CommentsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CommentsListRequestExpand? Expand { get; init; }
+    public CommentsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return Comments created in the third party platform after this datetime.
     /// </summary>
-    public DateTime? RemoteCreatedAfter { get; init; }
+    public DateTime? RemoteCreatedAfter { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return comments for this ticket.
     /// </summary>
-    public string? TicketId { get; init; }
+    public string? TicketId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Comments/Requests/CommentsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Comments/Requests/CommentsRetrieveRequest.cs
index ed6ae163..7c66ed2b 100644
--- a/src/Merge.Client/Ticketing/Comments/Requests/CommentsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Comments/Requests/CommentsRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class CommentsRetrieveRequest
+public record CommentsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public CommentsRetrieveRequestExpand? Expand { get; init; }
+    public CommentsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Comments/Types/CommentsListRequestExpand.cs b/src/Merge.Client/Ticketing/Comments/Types/CommentsListRequestExpand.cs
index 76009843..ad45ed4e 100644
--- a/src/Merge.Client/Ticketing/Comments/Types/CommentsListRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Comments/Types/CommentsListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Comments/Types/CommentsRetrieveRequestExpand.cs b/src/Merge.Client/Ticketing/Comments/Types/CommentsRetrieveRequestExpand.cs
index d52e4c78..4a689e41 100644
--- a/src/Merge.Client/Ticketing/Comments/Types/CommentsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Comments/Types/CommentsRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Contacts/ContactsClient.cs b/src/Merge.Client/Ticketing/Contacts/ContactsClient.cs
index e810c466..4bb5a102 100644
--- a/src/Merge.Client/Ticketing/Contacts/ContactsClient.cs
+++ b/src/Merge.Client/Ticketing/Contacts/ContactsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public ContactsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Contact` objects.
     /// </summary>
-    public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
+    public async Task<PaginatedContactList> ListAsync(
+        ContactsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -47,11 +52,15 @@ public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -64,23 +73,40 @@ public async Task<PaginatedContactList> ListAsync(ContactsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/contacts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedContactList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedContactList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Contact` object with the given values.
     /// </summary>
-    public async Task<TicketingContactResponse> CreateAsync(TicketingContactEndpointRequest request)
+    public async Task<TicketingContactResponse> CreateAsync(
+        TicketingContactEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -94,23 +120,41 @@ public async Task<TicketingContactResponse> CreateAsync(TicketingContactEndpoint
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/contacts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TicketingContactResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TicketingContactResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Contact` object with the given `id`.
     /// </summary>
-    public async Task<Contact> RetrieveAsync(string id, ContactsRetrieveRequest request)
+    public async Task<Contact> RetrieveAsync(
+        string id,
+        ContactsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -124,36 +168,64 @@ public async Task<Contact> RetrieveAsync(string id, ContactsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/contacts/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Contact>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Contact>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `TicketingContact` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/contacts/meta/post"
+                Path = "ticketing/v1/contacts/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Contacts/Requests/ContactsListRequest.cs b/src/Merge.Client/Ticketing/Contacts/Requests/ContactsListRequest.cs
index 3cc2dadc..1643e5e2 100644
--- a/src/Merge.Client/Ticketing/Contacts/Requests/ContactsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Contacts/Requests/ContactsListRequest.cs
@@ -1,54 +1,54 @@
 namespace Merge.Client.Ticketing;
 
-public class ContactsListRequest
+public record ContactsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Contacts/Requests/ContactsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Contacts/Requests/ContactsRetrieveRequest.cs
index c7990768..d069d1fa 100644
--- a/src/Merge.Client/Ticketing/Contacts/Requests/ContactsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Contacts/Requests/ContactsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Ticketing;
 
-public class ContactsRetrieveRequest
+public record ContactsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public string? Expand { get; init; }
+    public string? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Contacts/Requests/TicketingContactEndpointRequest.cs b/src/Merge.Client/Ticketing/Contacts/Requests/TicketingContactEndpointRequest.cs
index bda26072..c13a84c0 100644
--- a/src/Merge.Client/Ticketing/Contacts/Requests/TicketingContactEndpointRequest.cs
+++ b/src/Merge.Client/Ticketing/Contacts/Requests/TicketingContactEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class TicketingContactEndpointRequest
+public record TicketingContactEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public ContactRequest Model { get; init; }
+    public required ContactRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/DeleteAccount/DeleteAccountClient.cs b/src/Merge.Client/Ticketing/DeleteAccount/DeleteAccountClient.cs
index 7ff0180e..fcb39a7e 100644
--- a/src/Merge.Client/Ticketing/DeleteAccount/DeleteAccountClient.cs
+++ b/src/Merge.Client/Ticketing/DeleteAccount/DeleteAccountClient.cs
@@ -1,4 +1,5 @@
-using Merge.Client;
+using System.Net.Http;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -16,14 +17,26 @@ public DeleteAccountClient(RawClient client)
     /// <summary>
     /// Delete a linked account.
     /// </summary>
-    public async void DeleteAsync()
+    public async Task DeleteAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "ticketing/v1/delete-account"
+                Path = "ticketing/v1/delete-account",
+                Options = options
             }
         );
+        if (response.StatusCode is >= 200 and < 400)
+        {
+            return;
+        }
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/FieldMapping/FieldMappingClient.cs b/src/Merge.Client/Ticketing/FieldMapping/FieldMappingClient.cs
index 7a936880..b8f67c8b 100644
--- a/src/Merge.Client/Ticketing/FieldMapping/FieldMappingClient.cs
+++ b/src/Merge.Client/Ticketing/FieldMapping/FieldMappingClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,64 +18,112 @@ public FieldMappingClient(RawClient client)
     /// <summary>
     /// Get all Field Mappings for this Linked Account. Field Mappings are mappings between third-party Remote Fields and user defined Merge fields. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
-    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync()
+    public async Task<FieldMappingApiInstanceResponse> FieldMappingsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/field-mappings"
+                Path = "ticketing/v1/field-mappings",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingApiInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingApiInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Create new Field Mappings that will be available after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsCreateAsync(
-        CreateFieldMappingRequest request
+        CreateFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/field-mappings",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Deletes Field Mappings for a Linked Account. All data related to this Field Mapping will be deleted and these changes will be reflected after the next scheduled sync. This will cause the next sync for this Linked Account to sync **ALL** data from start.
     /// </summary>
-    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string fieldMappingId)
+    public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(
+        string fieldMappingId,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Delete,
-                Path = $"ticketing/v1/field-mappings/{fieldMappingId}"
+                Path = $"ticketing/v1/field-mappings/{fieldMappingId}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -83,30 +131,46 @@ public async Task<FieldMappingInstanceResponse> FieldMappingsDestroyAsync(string
     /// </summary>
     public async Task<FieldMappingInstanceResponse> FieldMappingsPartialUpdateAsync(
         string fieldMappingId,
-        PatchedEditFieldMappingRequest request
+        PatchedEditFieldMappingRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"ticketing/v1/field-mappings/{fieldMappingId}",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<FieldMappingInstanceResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<FieldMappingInstanceResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all remote fields for a Linked Account. Remote fields are third-party fields that are accessible after initial sync if remote_data is enabled. You can use remote fields to override existing Merge fields or map a new Merge field. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/overview/).
     /// </summary>
     public async Task<RemoteFieldApiResponse> RemoteFieldsRetrieveAsync(
-        RemoteFieldsRetrieveRequest request
+        RemoteFieldsRetrieveRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -121,36 +185,66 @@ RemoteFieldsRetrieveRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/remote-fields",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all organization-wide Target Fields, this will not include any Linked Account specific Target Fields. Organization-wide Target Fields are additional fields appended to the Merge Common Model for all Linked Accounts in a category. [Learn more](https://docs.merge.dev/supplemental-data/field-mappings/target-fields/).
     /// </summary>
-    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync()
+    public async Task<ExternalTargetFieldApiResponse> TargetFieldsRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/target-fields"
+                Path = "ticketing/v1/target-fields",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<ExternalTargetFieldApiResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<ExternalTargetFieldApiResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/FieldMapping/Requests/CreateFieldMappingRequest.cs b/src/Merge.Client/Ticketing/FieldMapping/Requests/CreateFieldMappingRequest.cs
index 32f5f932..037bc991 100644
--- a/src/Merge.Client/Ticketing/FieldMapping/Requests/CreateFieldMappingRequest.cs
+++ b/src/Merge.Client/Ticketing/FieldMapping/Requests/CreateFieldMappingRequest.cs
@@ -4,41 +4,41 @@
 
 namespace Merge.Client.Ticketing;
 
-public class CreateFieldMappingRequest
+public record CreateFieldMappingRequest
 {
     /// <summary>
     /// The name of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_name")]
-    public string TargetFieldName { get; init; }
+    public required string TargetFieldName { get; set; }
 
     /// <summary>
     /// The description of the target field you want this remote field to map to.
     /// </summary>
     [JsonPropertyName("target_field_description")]
-    public string TargetFieldDescription { get; init; }
+    public required string TargetFieldDescription { get; set; }
 
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object> RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object> RemoteFieldTraversalPath { get; set; } = new List<object>();
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string RemoteMethod { get; init; }
+    public required string RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string RemoteUrlPath { get; init; }
+    public required string RemoteUrlPath { get; set; }
 
     /// <summary>
     /// The name of the Common Model that the remote field corresponds to in a given category.
     /// </summary>
     [JsonPropertyName("common_model_name")]
-    public string CommonModelName { get; init; }
+    public required string CommonModelName { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs b/src/Merge.Client/Ticketing/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
index 57139667..b8b41b3f 100644
--- a/src/Merge.Client/Ticketing/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
+++ b/src/Merge.Client/Ticketing/FieldMapping/Requests/PatchedEditFieldMappingRequest.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Ticketing;
 
-public class PatchedEditFieldMappingRequest
+public record PatchedEditFieldMappingRequest
 {
     /// <summary>
     /// The field traversal path of the remote field listed when you hit the GET /remote-fields endpoint.
     /// </summary>
     [JsonPropertyName("remote_field_traversal_path")]
-    public IEnumerable<object>? RemoteFieldTraversalPath { get; init; }
+    public IEnumerable<object>? RemoteFieldTraversalPath { get; set; }
 
     /// <summary>
     /// The method of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_method")]
-    public string? RemoteMethod { get; init; }
+    public string? RemoteMethod { get; set; }
 
     /// <summary>
     /// The path of the remote endpoint where the remote field is coming from.
     /// </summary>
     [JsonPropertyName("remote_url_path")]
-    public string? RemoteUrlPath { get; init; }
+    public string? RemoteUrlPath { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs b/src/Merge.Client/Ticketing/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
index 6904b27a..7795fcf9 100644
--- a/src/Merge.Client/Ticketing/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/FieldMapping/Requests/RemoteFieldsRetrieveRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Ticketing;
 
-public class RemoteFieldsRetrieveRequest
+public record RemoteFieldsRetrieveRequest
 {
     /// <summary>
     /// A comma seperated list of Common Model names. If included, will only return Remote Fields for those Common Models.
     /// </summary>
-    public string? CommonModels { get; init; }
+    public string? CommonModels { get; set; }
 
     /// <summary>
     /// If true, will include example values, where available, for remote fields in the 3rd party platform. These examples come from active data from your customers.
     /// </summary>
-    public string? IncludeExampleValues { get; init; }
+    public string? IncludeExampleValues { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/ForceResync/ForceResyncClient.cs b/src/Merge.Client/Ticketing/ForceResync/ForceResyncClient.cs
index dc6c4671..899ecf7f 100644
--- a/src/Merge.Client/Ticketing/ForceResync/ForceResyncClient.cs
+++ b/src/Merge.Client/Ticketing/ForceResync/ForceResyncClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,20 +18,36 @@ public ForceResyncClient(RawClient client)
     /// <summary>
     /// Force re-sync of all models. This is available for all organizations via the dashboard. Force re-sync is also available programmatically via API for monthly, quarterly, and highest sync frequency customers on the Launch, Professional, or Enterprise plans. Doing so will consume a sync credit for the relevant linked account.
     /// </summary>
-    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync()
+    public async Task<IEnumerable<SyncStatus>> SyncStatusResyncCreateAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
-                Path = "ticketing/v1/sync-status/resync"
+                Path = "ticketing/v1/sync-status/resync",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<SyncStatus>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<SyncStatus>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/GenerateKey/GenerateKeyClient.cs b/src/Merge.Client/Ticketing/GenerateKey/GenerateKeyClient.cs
index 83db7b7f..f651c498 100644
--- a/src/Merge.Client/Ticketing/GenerateKey/GenerateKeyClient.cs
+++ b/src/Merge.Client/Ticketing/GenerateKey/GenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public GenerateKeyClient(RawClient client)
     /// <summary>
     /// Create a remote key.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(GenerateRemoteKeyRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        GenerateRemoteKeyRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/generate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/GenerateKey/Requests/GenerateRemoteKeyRequest.cs b/src/Merge.Client/Ticketing/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
index 0aa9b55e..1a4566d8 100644
--- a/src/Merge.Client/Ticketing/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
+++ b/src/Merge.Client/Ticketing/GenerateKey/Requests/GenerateRemoteKeyRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ticketing;
 
-public class GenerateRemoteKeyRequest
+public record GenerateRemoteKeyRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Issues/IssuesClient.cs b/src/Merge.Client/Ticketing/Issues/IssuesClient.cs
index 8c3dc816..bec701a4 100644
--- a/src/Merge.Client/Ticketing/Issues/IssuesClient.cs
+++ b/src/Merge.Client/Ticketing/Issues/IssuesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public IssuesClient(RawClient client)
     /// <summary>
     /// Gets all issues for Organization.
     /// </summary>
-    public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
+    public async Task<PaginatedIssueList> ListAsync(
+        IssuesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountToken != null)
@@ -40,13 +43,13 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         if (request.FirstIncidentTimeAfter != null)
         {
             _query["first_incident_time_after"] = request.FirstIncidentTimeAfter.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.FirstIncidentTimeBefore != null)
         {
             _query["first_incident_time_before"] = request.FirstIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.IncludeMuted != null)
@@ -59,12 +62,14 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         }
         if (request.LastIncidentTimeAfter != null)
         {
-            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString("o0");
+            _query["last_incident_time_after"] = request.LastIncidentTimeAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.LastIncidentTimeBefore != null)
         {
             _query["last_incident_time_before"] = request.LastIncidentTimeBefore.Value.ToString(
-                "o0"
+                Constants.DateTimeFormat
             );
         }
         if (request.LinkedAccountId != null)
@@ -86,36 +91,64 @@ public async Task<PaginatedIssueList> ListAsync(IssuesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/issues",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedIssueList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedIssueList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get a specific issue.
     /// </summary>
-    public async Task<Issue> RetrieveAsync(string id)
+    public async Task<Issue> RetrieveAsync(string id, RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"ticketing/v1/issues/{id}"
+                Path = $"ticketing/v1/issues/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Issue>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Issue>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Issues/Requests/IssuesListRequest.cs b/src/Merge.Client/Ticketing/Issues/Requests/IssuesListRequest.cs
index 136a3888..f3810fc8 100644
--- a/src/Merge.Client/Ticketing/Issues/Requests/IssuesListRequest.cs
+++ b/src/Merge.Client/Ticketing/Issues/Requests/IssuesListRequest.cs
@@ -1,66 +1,62 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class IssuesListRequest
+public record IssuesListRequest
 {
-    public string? AccountToken { get; init; }
+    public string? AccountToken { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred before this time
     /// </summary>
-    public string? EndDate { get; init; }
+    public string? EndDate { get; set; }
 
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was after this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeAfter { get; init; }
+    public DateTime? FirstIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose first incident time was before this datetime.
     /// </summary>
-    public DateTime? FirstIncidentTimeBefore { get; init; }
+    public DateTime? FirstIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If true, will include muted issues
     /// </summary>
-    public string? IncludeMuted { get; init; }
+    public string? IncludeMuted { get; set; }
 
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was after this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeAfter { get; init; }
+    public DateTime? LastIncidentTimeAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return issues whose last incident time was before this datetime.
     /// </summary>
-    public DateTime? LastIncidentTimeBefore { get; init; }
+    public DateTime? LastIncidentTimeBefore { get; set; }
 
     /// <summary>
     /// If provided, will only include issues pertaining to the linked account passed in.
     /// </summary>
-    public string? LinkedAccountId { get; init; }
+    public string? LinkedAccountId { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If included, will only include issues whose most recent action occurred after this time
     /// </summary>
-    public string? StartDate { get; init; }
+    public string? StartDate { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -68,5 +64,5 @@ public class IssuesListRequest
     /// - `ONGOING` - ONGOING
     /// - `RESOLVED` - RESOLVED
     /// </summary>
-    public IssuesListRequestStatus? Status { get; init; }
+    public IssuesListRequestStatus? Status { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Issues/Types/IssuesListRequestStatus.cs b/src/Merge.Client/Ticketing/Issues/Types/IssuesListRequestStatus.cs
index b18e3b67..86887745 100644
--- a/src/Merge.Client/Ticketing/Issues/Types/IssuesListRequestStatus.cs
+++ b/src/Merge.Client/Ticketing/Issues/Types/IssuesListRequestStatus.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/LinkToken/LinkTokenClient.cs b/src/Merge.Client/Ticketing/LinkToken/LinkTokenClient.cs
index 8de3a90e..97d3a99b 100644
--- a/src/Merge.Client/Ticketing/LinkToken/LinkTokenClient.cs
+++ b/src/Merge.Client/Ticketing/LinkToken/LinkTokenClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public LinkTokenClient(RawClient client)
     /// <summary>
     /// Creates a link token to be used when linking a new end user.
     /// </summary>
-    public async Task<LinkToken> CreateAsync(EndUserDetailsRequest request)
+    public async Task<LinkToken> CreateAsync(
+        EndUserDetailsRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/link-token",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<LinkToken>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<LinkToken>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/LinkToken/Requests/EndUserDetailsRequest.cs b/src/Merge.Client/Ticketing/LinkToken/Requests/EndUserDetailsRequest.cs
index 5444c2c7..785482c5 100644
--- a/src/Merge.Client/Ticketing/LinkToken/Requests/EndUserDetailsRequest.cs
+++ b/src/Merge.Client/Ticketing/LinkToken/Requests/EndUserDetailsRequest.cs
@@ -1,65 +1,64 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class EndUserDetailsRequest
+public record EndUserDetailsRequest
 {
     /// <summary>
     /// Your end user's email address. This is purely for identification purposes - setting this value will not cause any emails to be sent.
     /// </summary>
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// Your end user's organization.
     /// </summary>
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// This unique identifier typically represents the ID for your end user in your product's database. This value must be distinct from other Linked Accounts' unique identifiers.
     /// </summary>
     [JsonPropertyName("end_user_origin_id")]
-    public string EndUserOriginId { get; init; }
+    public required string EndUserOriginId { get; set; }
 
     /// <summary>
     /// The integration categories to show in Merge Link.
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     /// <summary>
     /// The slug of a specific pre-selected integration for this linking flow token. For examples of slugs, see https://docs.merge.dev/guides/merge-link/single-integration/.
     /// </summary>
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     /// <summary>
     /// An integer number of minutes between [30, 720 or 10080 if for a Magic Link URL] for how long this token is valid. Defaults to 30.
     /// </summary>
     [JsonPropertyName("link_expiry_mins")]
-    public int? LinkExpiryMins { get; init; }
+    public int? LinkExpiryMins { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("should_create_magic_link_url")]
-    public bool? ShouldCreateMagicLinkUrl { get; init; }
+    public bool? ShouldCreateMagicLinkUrl { get; set; }
 
     /// <summary>
     /// Whether to generate a Magic Link URL on the Admin Needed screen during the linking flow. Defaults to false. For more information on Magic Link, see https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
     /// </summary>
     [JsonPropertyName("hide_admin_magic_link")]
-    public bool? HideAdminMagicLink { get; init; }
+    public bool? HideAdminMagicLink { get; set; }
 
     /// <summary>
     /// An array of objects to specify the models and fields that will be disabled for a given Linked Account. Each object uses model_id, enabled_actions, and disabled_fields to specify the model, method, and fields that are scoped for a given Linked Account.
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; init; }
+    public IEnumerable<CommonModelScopesBodyRequest>? CommonModels { get; set; }
 
     /// <summary>
     /// When creating a Link Token, you can set permissions for Common Models that will apply to the account that is going to be linked. Any model or field not specified in link token payload will default to existing settings.
@@ -68,17 +67,17 @@ public class EndUserDetailsRequest
     public Dictionary<
         string,
         IEnumerable<IndividualCommonModelScopeDeserializerRequest>?
-    >? CategoryCommonModelScopes { get; init; }
+    >? CategoryCommonModelScopes { get; set; }
 
     /// <summary>
     /// The language code for the language to localize Merge Link to.
     /// </summary>
     [JsonPropertyName("language")]
-    public string? Language { get; init; }
+    public string? Language { get; set; }
 
     /// <summary>
     /// A JSON object containing integration-specific configuration options.
     /// </summary>
     [JsonPropertyName("integration_specific_config")]
-    public Dictionary<string, object>? IntegrationSpecificConfig { get; init; }
+    public Dictionary<string, object?>? IntegrationSpecificConfig { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/LinkedAccounts/LinkedAccountsClient.cs b/src/Merge.Client/Ticketing/LinkedAccounts/LinkedAccountsClient.cs
index 4de4c97d..c2c73f83 100644
--- a/src/Merge.Client/Ticketing/LinkedAccounts/LinkedAccountsClient.cs
+++ b/src/Merge.Client/Ticketing/LinkedAccounts/LinkedAccountsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -19,7 +19,8 @@ public LinkedAccountsClient(RawClient client)
     /// List linked accounts for your organization.
     /// </summary>
     public async Task<PaginatedAccountDetailsAndActionsList> ListAsync(
-        LinkedAccountsListRequest request
+        LinkedAccountsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -78,16 +79,30 @@ LinkedAccountsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/linked-accounts",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedAccountDetailsAndActionsList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/LinkedAccounts/Requests/LinkedAccountsListRequest.cs b/src/Merge.Client/Ticketing/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
index 54e880dd..baefd025 100644
--- a/src/Merge.Client/Ticketing/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
+++ b/src/Merge.Client/Ticketing/LinkedAccounts/Requests/LinkedAccountsListRequest.cs
@@ -1,10 +1,6 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class LinkedAccountsListRequest
+public record LinkedAccountsListRequest
 {
     /// <summary>
     /// Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
@@ -17,62 +13,62 @@ public class LinkedAccountsListRequest
     /// - `mktg` - mktg
     /// - `filestorage` - filestorage
     /// </summary>
-    public LinkedAccountsListRequestCategory? Category { get; init; }
+    public LinkedAccountsListRequestCategory? Category { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given email address.
     /// </summary>
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given organization name.
     /// </summary>
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given origin ID.
     /// </summary>
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     /// <summary>
     /// Comma-separated list of EndUser origin IDs, making it possible to specify multiple EndUsers at once.
     /// </summary>
-    public string? EndUserOriginIds { get; init; }
+    public string? EndUserOriginIds { get; set; }
 
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Comma-separated list of LinkedAccount IDs, making it possible to specify multiple LinkedAccounts at once.
     /// </summary>
-    public string? Ids { get; init; }
+    public string? Ids { get; set; }
 
     /// <summary>
     /// If `true`, will include complete production duplicates of the account specified by the `id` query parameter in the response. `id` must be for a complete production linked account.
     /// </summary>
-    public bool? IncludeDuplicates { get; init; }
+    public bool? IncludeDuplicates { get; set; }
 
     /// <summary>
     /// If provided, will only return linked accounts associated with the given integration name.
     /// </summary>
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     /// <summary>
     /// If included, will only include test linked accounts. If not included, will only include non-test linked accounts.
     /// </summary>
-    public string? IsTestAccount { get; init; }
+    public string? IsTestAccount { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// Filter by status. Options: `COMPLETE`, `INCOMPLETE`, `RELINK_NEEDED`
     /// </summary>
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs b/src/Merge.Client/Ticketing/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
index f42d008d..f06cdd8d 100644
--- a/src/Merge.Client/Ticketing/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
+++ b/src/Merge.Client/Ticketing/LinkedAccounts/Types/LinkedAccountsListRequestCategory.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Passthrough/PassthroughClient.cs b/src/Merge.Client/Ticketing/Passthrough/PassthroughClient.cs
index 072e866e..5f39b625 100644
--- a/src/Merge.Client/Ticketing/Passthrough/PassthroughClient.cs
+++ b/src/Merge.Client/Ticketing/Passthrough/PassthroughClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public PassthroughClient(RawClient client)
     /// <summary>
     /// Pull data from an endpoint not currently supported by Merge.
     /// </summary>
-    public async Task<RemoteResponse> CreateAsync(DataPassthroughRequest request)
+    public async Task<RemoteResponse> CreateAsync(
+        DataPassthroughRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/passthrough",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Projects/ProjectsClient.cs b/src/Merge.Client/Ticketing/Projects/ProjectsClient.cs
index ba3277b7..fd272d55 100644
--- a/src/Merge.Client/Ticketing/Projects/ProjectsClient.cs
+++ b/src/Merge.Client/Ticketing/Projects/ProjectsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public ProjectsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Project` objects.
     /// </summary>
-    public async Task<PaginatedProjectList> ListAsync(ProjectsListRequest request)
+    public async Task<PaginatedProjectList> ListAsync(
+        ProjectsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedProjectList> ListAsync(ProjectsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedProjectList> ListAsync(ProjectsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/projects",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedProjectList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedProjectList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Project` object with the given `id`.
     /// </summary>
-    public async Task<Project> RetrieveAsync(string id, ProjectsRetrieveRequest request)
+    public async Task<Project> RetrieveAsync(
+        string id,
+        ProjectsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,17 +113,31 @@ public async Task<Project> RetrieveAsync(string id, ProjectsRetrieveRequest requ
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/projects/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Project>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Project>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -104,7 +145,8 @@ public async Task<Project> RetrieveAsync(string id, ProjectsRetrieveRequest requ
     /// </summary>
     public async Task<PaginatedUserList> UsersListAsync(
         string parentId,
-        ProjectsUsersListRequest request
+        ProjectsUsersListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -131,16 +173,30 @@ ProjectsUsersListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/projects/{parentId}/users",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedUserList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedUserList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Projects/Requests/ProjectsListRequest.cs b/src/Merge.Client/Ticketing/Projects/Requests/ProjectsListRequest.cs
index 99605745..9e2201c4 100644
--- a/src/Merge.Client/Ticketing/Projects/Requests/ProjectsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Projects/Requests/ProjectsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ticketing;
 
-public class ProjectsListRequest
+public record ProjectsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Projects/Requests/ProjectsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Projects/Requests/ProjectsRetrieveRequest.cs
index 63e6871b..94d173bb 100644
--- a/src/Merge.Client/Ticketing/Projects/Requests/ProjectsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Projects/Requests/ProjectsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ticketing;
 
-public class ProjectsRetrieveRequest
+public record ProjectsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Projects/Requests/ProjectsUsersListRequest.cs b/src/Merge.Client/Ticketing/Projects/Requests/ProjectsUsersListRequest.cs
index 864df043..93044729 100644
--- a/src/Merge.Client/Ticketing/Projects/Requests/ProjectsUsersListRequest.cs
+++ b/src/Merge.Client/Ticketing/Projects/Requests/ProjectsUsersListRequest.cs
@@ -1,33 +1,29 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class ProjectsUsersListRequest
+public record ProjectsUsersListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public ProjectsUsersListRequestExpand? Expand { get; init; }
+    public ProjectsUsersListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Projects/Types/ProjectsUsersListRequestExpand.cs b/src/Merge.Client/Ticketing/Projects/Types/ProjectsUsersListRequestExpand.cs
index af87a736..dee66fca 100644
--- a/src/Merge.Client/Ticketing/Projects/Types/ProjectsUsersListRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Projects/Types/ProjectsUsersListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/RegenerateKey/RegenerateKeyClient.cs b/src/Merge.Client/Ticketing/RegenerateKey/RegenerateKeyClient.cs
index d401e18d..a1c65c31 100644
--- a/src/Merge.Client/Ticketing/RegenerateKey/RegenerateKeyClient.cs
+++ b/src/Merge.Client/Ticketing/RegenerateKey/RegenerateKeyClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,21 +18,38 @@ public RegenerateKeyClient(RawClient client)
     /// <summary>
     /// Exchange remote keys.
     /// </summary>
-    public async Task<RemoteKey> CreateAsync(RemoteKeyForRegenerationRequest request)
+    public async Task<RemoteKey> CreateAsync(
+        RemoteKeyForRegenerationRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/regenerate-key",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<RemoteKey>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<RemoteKey>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs b/src/Merge.Client/Ticketing/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
index 18e26d60..80d88cf1 100644
--- a/src/Merge.Client/Ticketing/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
+++ b/src/Merge.Client/Ticketing/RegenerateKey/Requests/RemoteKeyForRegenerationRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteKeyForRegenerationRequest
+public record RemoteKeyForRegenerationRequest
 {
     /// <summary>
     /// The name of the remote key
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Roles/Requests/RolesListRequest.cs b/src/Merge.Client/Ticketing/Roles/Requests/RolesListRequest.cs
index 26ad60a2..15b849ed 100644
--- a/src/Merge.Client/Ticketing/Roles/Requests/RolesListRequest.cs
+++ b/src/Merge.Client/Ticketing/Roles/Requests/RolesListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ticketing;
 
-public class RolesListRequest
+public record RolesListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Roles/Requests/RolesRetrieveRequest.cs b/src/Merge.Client/Ticketing/Roles/Requests/RolesRetrieveRequest.cs
index a2f146b1..4d0fdadc 100644
--- a/src/Merge.Client/Ticketing/Roles/Requests/RolesRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Roles/Requests/RolesRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ticketing;
 
-public class RolesRetrieveRequest
+public record RolesRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Roles/RolesClient.cs b/src/Merge.Client/Ticketing/Roles/RolesClient.cs
index 39fab211..b49a01f4 100644
--- a/src/Merge.Client/Ticketing/Roles/RolesClient.cs
+++ b/src/Merge.Client/Ticketing/Roles/RolesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public RolesClient(RawClient client)
     /// <summary>
     /// Returns a list of `Role` objects.
     /// </summary>
-    public async Task<PaginatedRoleList> ListAsync(RolesListRequest request)
+    public async Task<PaginatedRoleList> ListAsync(
+        RolesListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedRoleList> ListAsync(RolesListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedRoleList> ListAsync(RolesListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/roles",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRoleList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRoleList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Role` object with the given `id`.
     /// </summary>
-    public async Task<Role> RetrieveAsync(string id, RolesRetrieveRequest request)
+    public async Task<Role> RetrieveAsync(
+        string id,
+        RolesRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<Role> RetrieveAsync(string id, RolesRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/roles/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Role>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Role>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Ticketing/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
index 7e94d7ed..62c8944a 100644
--- a/src/Merge.Client/Ticketing/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Ticketing/Scopes/Requests/LinkedAccountCommonModelScopeDeserializerRequest.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class LinkedAccountCommonModelScopeDeserializerRequest
+public record LinkedAccountCommonModelScopeDeserializerRequest
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializerRequest> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializerRequest>();
 }
diff --git a/src/Merge.Client/Ticketing/Scopes/ScopesClient.cs b/src/Merge.Client/Ticketing/Scopes/ScopesClient.cs
index 5198b892..afaab075 100644
--- a/src/Merge.Client/Ticketing/Scopes/ScopesClient.cs
+++ b/src/Merge.Client/Ticketing/Scopes/ScopesClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,63 +18,110 @@ public ScopesClient(RawClient client)
     /// <summary>
     /// Get the default permissions for Merge Common Models and fields across all Linked Accounts of a given category. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> DefaultScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/default-scopes"
+                Path = "ticketing/v1/default-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Get all available permissions for Merge Common Models and fields for a single Linked Account. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
     /// </summary>
-    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync()
+    public async Task<CommonModelScopeApi> LinkedAccountScopesRetrieveAsync(
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/linked-account-scopes"
+                Path = "ticketing/v1/linked-account-scopes",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Update permissions for any Common Model or field for a single Linked Account. Any Scopes not set in this POST request will inherit the default Scopes. [Learn more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes)
     /// </summary>
     public async Task<CommonModelScopeApi> LinkedAccountScopesCreateAsync(
-        LinkedAccountCommonModelScopeDeserializerRequest request
+        LinkedAccountCommonModelScopeDeserializerRequest request,
+        RequestOptions? options = null
     )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/linked-account-scopes",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<CommonModelScopeApi>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<CommonModelScopeApi>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/SyncStatus/Requests/SyncStatusListRequest.cs b/src/Merge.Client/Ticketing/SyncStatus/Requests/SyncStatusListRequest.cs
index 67d6381b..4bd3c83b 100644
--- a/src/Merge.Client/Ticketing/SyncStatus/Requests/SyncStatusListRequest.cs
+++ b/src/Merge.Client/Ticketing/SyncStatus/Requests/SyncStatusListRequest.cs
@@ -1,14 +1,14 @@
 namespace Merge.Client.Ticketing;
 
-public class SyncStatusListRequest
+public record SyncStatusListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/SyncStatus/SyncStatusClient.cs b/src/Merge.Client/Ticketing/SyncStatus/SyncStatusClient.cs
index f4c0d075..93143e20 100644
--- a/src/Merge.Client/Ticketing/SyncStatus/SyncStatusClient.cs
+++ b/src/Merge.Client/Ticketing/SyncStatus/SyncStatusClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public SyncStatusClient(RawClient client)
     /// <summary>
     /// Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `PARTIALLY_SYNCED`, `PAUSED`, `SYNCING`. Learn more about sync status in our [Help Center](https://help.merge.dev/en/articles/8184193-merge-sync-statuses).
     /// </summary>
-    public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest request)
+    public async Task<PaginatedSyncStatusList> ListAsync(
+        SyncStatusListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Cursor != null)
@@ -32,16 +35,30 @@ public async Task<PaginatedSyncStatusList> ListAsync(SyncStatusListRequest reque
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/sync-status",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedSyncStatusList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedSyncStatusList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Tags/Requests/TagsListRequest.cs b/src/Merge.Client/Ticketing/Tags/Requests/TagsListRequest.cs
index 2a12f0e5..c6793f1c 100644
--- a/src/Merge.Client/Ticketing/Tags/Requests/TagsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Tags/Requests/TagsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ticketing;
 
-public class TagsListRequest
+public record TagsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Tags/Requests/TagsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Tags/Requests/TagsRetrieveRequest.cs
index 14651aa9..d5678e3e 100644
--- a/src/Merge.Client/Ticketing/Tags/Requests/TagsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Tags/Requests/TagsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ticketing;
 
-public class TagsRetrieveRequest
+public record TagsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Tags/TagsClient.cs b/src/Merge.Client/Ticketing/Tags/TagsClient.cs
index b91fd440..7d22afcc 100644
--- a/src/Merge.Client/Ticketing/Tags/TagsClient.cs
+++ b/src/Merge.Client/Ticketing/Tags/TagsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public TagsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Tag` objects.
     /// </summary>
-    public async Task<PaginatedTagList> ListAsync(TagsListRequest request)
+    public async Task<PaginatedTagList> ListAsync(
+        TagsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedTagList> ListAsync(TagsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedTagList> ListAsync(TagsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/tags",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTagList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTagList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Tag` object with the given `id`.
     /// </summary>
-    public async Task<Tag> RetrieveAsync(string id, TagsRetrieveRequest request)
+    public async Task<Tag> RetrieveAsync(
+        string id,
+        TagsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<Tag> RetrieveAsync(string id, TagsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/tags/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Tag>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Tag>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Teams/Requests/TeamsListRequest.cs b/src/Merge.Client/Ticketing/Teams/Requests/TeamsListRequest.cs
index 1dd16e0c..90bcc709 100644
--- a/src/Merge.Client/Ticketing/Teams/Requests/TeamsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Teams/Requests/TeamsListRequest.cs
@@ -1,49 +1,49 @@
 namespace Merge.Client.Ticketing;
 
-public class TeamsListRequest
+public record TeamsListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Teams/Requests/TeamsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Teams/Requests/TeamsRetrieveRequest.cs
index c4491c1f..ae5763cd 100644
--- a/src/Merge.Client/Ticketing/Teams/Requests/TeamsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Teams/Requests/TeamsRetrieveRequest.cs
@@ -1,9 +1,9 @@
 namespace Merge.Client.Ticketing;
 
-public class TeamsRetrieveRequest
+public record TeamsRetrieveRequest
 {
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Teams/TeamsClient.cs b/src/Merge.Client/Ticketing/Teams/TeamsClient.cs
index 29e00c9a..0bf59bbc 100644
--- a/src/Merge.Client/Ticketing/Teams/TeamsClient.cs
+++ b/src/Merge.Client/Ticketing/Teams/TeamsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public TeamsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Team` objects.
     /// </summary>
-    public async Task<PaginatedTeamList> ListAsync(TeamsListRequest request)
+    public async Task<PaginatedTeamList> ListAsync(
+        TeamsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -43,11 +48,15 @@ public async Task<PaginatedTeamList> ListAsync(TeamsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -60,23 +69,41 @@ public async Task<PaginatedTeamList> ListAsync(TeamsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/teams",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTeamList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTeamList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Team` object with the given `id`.
     /// </summary>
-    public async Task<Team> RetrieveAsync(string id, TeamsRetrieveRequest request)
+    public async Task<Team> RetrieveAsync(
+        string id,
+        TeamsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IncludeRemoteData != null)
@@ -86,16 +113,30 @@ public async Task<Team> RetrieveAsync(string id, TeamsRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/teams/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Team>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Team>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/TicketingClient.cs b/src/Merge.Client/Ticketing/TicketingClient.cs
index ab07bb3c..ab1cca82 100644
--- a/src/Merge.Client/Ticketing/TicketingClient.cs
+++ b/src/Merge.Client/Ticketing/TicketingClient.cs
@@ -1,5 +1,4 @@
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Requests/PatchedTicketEndpointRequest.cs b/src/Merge.Client/Ticketing/Tickets/Requests/PatchedTicketEndpointRequest.cs
index dd008f88..d3fd76ba 100644
--- a/src/Merge.Client/Ticketing/Tickets/Requests/PatchedTicketEndpointRequest.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Requests/PatchedTicketEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class PatchedTicketEndpointRequest
+public record PatchedTicketEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public PatchedTicketRequest Model { get; init; }
+    public required PatchedTicketRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Tickets/Requests/TicketEndpointRequest.cs b/src/Merge.Client/Ticketing/Tickets/Requests/TicketEndpointRequest.cs
index 670c61d2..8872898f 100644
--- a/src/Merge.Client/Ticketing/Tickets/Requests/TicketEndpointRequest.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Requests/TicketEndpointRequest.cs
@@ -1,20 +1,16 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class TicketEndpointRequest
+public record TicketEndpointRequest
 {
     /// <summary>
     /// Whether to include debug fields (such as log file links) in the response.
     /// </summary>
-    public bool? IsDebugMode { get; init; }
+    public bool? IsDebugMode { get; set; }
 
     /// <summary>
     /// Whether or not third-party updates should be run asynchronously.
     /// </summary>
-    public bool? RunAsync { get; init; }
+    public bool? RunAsync { get; set; }
 
-    public TicketRequest Model { get; init; }
+    public required TicketRequest Model { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Tickets/Requests/TicketsCollaboratorsListRequest.cs b/src/Merge.Client/Ticketing/Tickets/Requests/TicketsCollaboratorsListRequest.cs
index 68b270ad..c1580a21 100644
--- a/src/Merge.Client/Ticketing/Tickets/Requests/TicketsCollaboratorsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Requests/TicketsCollaboratorsListRequest.cs
@@ -1,33 +1,29 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class TicketsCollaboratorsListRequest
+public record TicketsCollaboratorsListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TicketsCollaboratorsListRequestExpand? Expand { get; init; }
+    public TicketsCollaboratorsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Tickets/Requests/TicketsListRequest.cs b/src/Merge.Client/Ticketing/Tickets/Requests/TicketsListRequest.cs
index 3ea6d10a..129dd6dd 100644
--- a/src/Merge.Client/Ticketing/Tickets/Requests/TicketsListRequest.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Requests/TicketsListRequest.cs
@@ -1,105 +1,101 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class TicketsListRequest
+public record TicketsListRequest
 {
     /// <summary>
     /// If provided, will only return tickets for this account.
     /// </summary>
-    public string? AccountId { get; init; }
+    public string? AccountId { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets assigned to the assignee_ids; multiple assignee_ids can be separated by commas.
     /// </summary>
-    public string? AssigneeIds { get; init; }
+    public string? AssigneeIds { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets assigned to the collection_ids; multiple collection_ids can be separated by commas.
     /// </summary>
-    public string? CollectionIds { get; init; }
+    public string? CollectionIds { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets completed after this datetime.
     /// </summary>
-    public DateTime? CompletedAfter { get; init; }
+    public DateTime? CompletedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets completed before this datetime.
     /// </summary>
-    public DateTime? CompletedBefore { get; init; }
+    public DateTime? CompletedBefore { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets for this contact.
     /// </summary>
-    public string? ContactId { get; init; }
+    public string? ContactId { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets due after this datetime.
     /// </summary>
-    public DateTime? DueAfter { get; init; }
+    public DateTime? DueAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets due before this datetime.
     /// </summary>
-    public DateTime? DueBefore { get; init; }
+    public DateTime? DueBefore { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TicketsListRequestExpand? Expand { get; init; }
+    public TicketsListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// If provided, will only return sub tickets of the parent_ticket_id.
     /// </summary>
-    public string? ParentTicketId { get; init; }
+    public string? ParentTicketId { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets of this priority.
@@ -109,42 +105,42 @@ public class TicketsListRequest
     /// - `NORMAL` - NORMAL
     /// - `LOW` - LOW
     /// </summary>
-    public TicketsListRequestPriority? Priority { get; init; }
+    public TicketsListRequestPriority? Priority { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets created in the third party platform after this datetime.
     /// </summary>
-    public DateTime? RemoteCreatedAfter { get; init; }
+    public DateTime? RemoteCreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets created in the third party platform before this datetime.
     /// </summary>
-    public DateTime? RemoteCreatedBefore { get; init; }
+    public DateTime? RemoteCreatedBefore { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public TicketsListRequestRemoteFields? RemoteFields { get; init; }
+    public TicketsListRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets updated in the third party platform after this datetime.
     /// </summary>
-    public DateTime? RemoteUpdatedAfter { get; init; }
+    public DateTime? RemoteUpdatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets updated in the third party platform before this datetime.
     /// </summary>
-    public DateTime? RemoteUpdatedBefore { get; init; }
+    public DateTime? RemoteUpdatedBefore { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public TicketsListRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public TicketsListRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets of this status.
@@ -154,20 +150,20 @@ public class TicketsListRequest
     /// - `IN_PROGRESS` - IN_PROGRESS
     /// - `ON_HOLD` - ON_HOLD
     /// </summary>
-    public TicketsListRequestStatus? Status { get; init; }
+    public TicketsListRequestStatus? Status { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets matching the tags; multiple tags can be separated by commas.
     /// </summary>
-    public string? Tags { get; init; }
+    public string? Tags { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets of this type.
     /// </summary>
-    public string? TicketType { get; init; }
+    public string? TicketType { get; set; }
 
     /// <summary>
     /// If provided, will only return tickets where the URL matches or contains the substring
     /// </summary>
-    public string? TicketUrl { get; init; }
+    public string? TicketUrl { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Tickets/Requests/TicketsRemoteFieldClassesListRequest.cs b/src/Merge.Client/Ticketing/Tickets/Requests/TicketsRemoteFieldClassesListRequest.cs
index f15fc9ba..5cda3726 100644
--- a/src/Merge.Client/Ticketing/Tickets/Requests/TicketsRemoteFieldClassesListRequest.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Requests/TicketsRemoteFieldClassesListRequest.cs
@@ -1,29 +1,29 @@
 namespace Merge.Client.Ticketing;
 
-public class TicketsRemoteFieldClassesListRequest
+public record TicketsRemoteFieldClassesListRequest
 {
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, will only return remote field classes with this is_common_model_field value
     /// </summary>
-    public bool? IsCommonModelField { get; init; }
+    public bool? IsCommonModelField { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Tickets/Requests/TicketsRetrieveRequest.cs b/src/Merge.Client/Ticketing/Tickets/Requests/TicketsRetrieveRequest.cs
index aab92375..988377d6 100644
--- a/src/Merge.Client/Ticketing/Tickets/Requests/TicketsRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Requests/TicketsRetrieveRequest.cs
@@ -1,33 +1,29 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class TicketsRetrieveRequest
+public record TicketsRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public TicketsRetrieveRequestExpand? Expand { get; init; }
+    public TicketsRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// Whether to include all remote fields, including fields that Merge did not map to common models, in a normalized format.
     /// </summary>
-    public bool? IncludeRemoteFields { get; init; }
+    public bool? IncludeRemoteFields { get; set; }
 
     /// <summary>
     /// Deprecated. Use show_enum_origins.
     /// </summary>
-    public TicketsRetrieveRequestRemoteFields? RemoteFields { get; init; }
+    public TicketsRetrieveRequestRemoteFields? RemoteFields { get; set; }
 
     /// <summary>
     /// A comma separated list of enum field names for which you'd like the original values to be returned, instead of Merge's normalized enum values. [Learn more](https://help.merge.dev/en/articles/8950958-show_enum_origins-query-parameter)
     /// </summary>
-    public TicketsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; init; }
+    public TicketsRetrieveRequestShowEnumOrigins? ShowEnumOrigins { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Tickets/TicketsClient.cs b/src/Merge.Client/Ticketing/Tickets/TicketsClient.cs
index 58a6822e..09cbfebe 100644
--- a/src/Merge.Client/Ticketing/Tickets/TicketsClient.cs
+++ b/src/Merge.Client/Ticketing/Tickets/TicketsClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,7 +18,10 @@ public TicketsClient(RawClient client)
     /// <summary>
     /// Returns a list of `Ticket` objects.
     /// </summary>
-    public async Task<PaginatedTicketList> ListAsync(TicketsListRequest request)
+    public async Task<PaginatedTicketList> ListAsync(
+        TicketsListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.AccountId != null)
@@ -35,11 +38,15 @@ public async Task<PaginatedTicketList> ListAsync(TicketsListRequest request)
         }
         if (request.CompletedAfter != null)
         {
-            _query["completed_after"] = request.CompletedAfter.Value.ToString("o0");
+            _query["completed_after"] = request.CompletedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.CompletedBefore != null)
         {
-            _query["completed_before"] = request.CompletedBefore.Value.ToString("o0");
+            _query["completed_before"] = request.CompletedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ContactId != null)
         {
@@ -47,11 +54,13 @@ public async Task<PaginatedTicketList> ListAsync(TicketsListRequest request)
         }
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -59,11 +68,11 @@ public async Task<PaginatedTicketList> ListAsync(TicketsListRequest request)
         }
         if (request.DueAfter != null)
         {
-            _query["due_after"] = request.DueAfter.Value.ToString("o0");
+            _query["due_after"] = request.DueAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.DueBefore != null)
         {
-            _query["due_before"] = request.DueBefore.Value.ToString("o0");
+            _query["due_before"] = request.DueBefore.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.Expand != null)
         {
@@ -83,11 +92,15 @@ public async Task<PaginatedTicketList> ListAsync(TicketsListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -103,11 +116,15 @@ public async Task<PaginatedTicketList> ListAsync(TicketsListRequest request)
         }
         if (request.RemoteCreatedAfter != null)
         {
-            _query["remote_created_after"] = request.RemoteCreatedAfter.Value.ToString("o0");
+            _query["remote_created_after"] = request.RemoteCreatedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.RemoteCreatedBefore != null)
         {
-            _query["remote_created_before"] = request.RemoteCreatedBefore.Value.ToString("o0");
+            _query["remote_created_before"] = request.RemoteCreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.RemoteFields != null)
         {
@@ -119,11 +136,15 @@ public async Task<PaginatedTicketList> ListAsync(TicketsListRequest request)
         }
         if (request.RemoteUpdatedAfter != null)
         {
-            _query["remote_updated_after"] = request.RemoteUpdatedAfter.Value.ToString("o0");
+            _query["remote_updated_after"] = request.RemoteUpdatedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.RemoteUpdatedBefore != null)
         {
-            _query["remote_updated_before"] = request.RemoteUpdatedBefore.Value.ToString("o0");
+            _query["remote_updated_before"] = request.RemoteUpdatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ShowEnumOrigins != null)
         {
@@ -148,23 +169,40 @@ public async Task<PaginatedTicketList> ListAsync(TicketsListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/tickets",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedTicketList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedTicketList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `Ticket` object with the given values.
     /// </summary>
-    public async Task<TicketResponse> CreateAsync(TicketEndpointRequest request)
+    public async Task<TicketResponse> CreateAsync(
+        TicketEndpointRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.IsDebugMode != null)
@@ -178,23 +216,41 @@ public async Task<TicketResponse> CreateAsync(TicketEndpointRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/tickets",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TicketResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TicketResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `Ticket` object with the given `id`.
     /// </summary>
-    public async Task<Ticket> RetrieveAsync(string id, TicketsRetrieveRequest request)
+    public async Task<Ticket> RetrieveAsync(
+        string id,
+        TicketsRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -220,17 +276,31 @@ public async Task<Ticket> RetrieveAsync(string id, TicketsRetrieveRequest reques
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/tickets/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<Ticket>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<Ticket>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -238,7 +308,8 @@ public async Task<Ticket> RetrieveAsync(string id, TicketsRetrieveRequest reques
     /// </summary>
     public async Task<TicketResponse> PartialUpdateAsync(
         string id,
-        PatchedTicketEndpointRequest request
+        PatchedTicketEndpointRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -253,17 +324,31 @@ PatchedTicketEndpointRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
-                Method = HttpMethod.Patch,
+                BaseUrl = _client.Options.BaseUrl,
+                Method = HttpMethodExtensions.Patch,
                 Path = $"ticketing/v1/tickets/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<TicketResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<TicketResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
@@ -271,7 +356,8 @@ PatchedTicketEndpointRequest request
     /// </summary>
     public async Task<PaginatedUserList> CollaboratorsListAsync(
         string parentId,
-        TicketsCollaboratorsListRequest request
+        TicketsCollaboratorsListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -298,64 +384,110 @@ TicketsCollaboratorsListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/tickets/{parentId}/collaborators",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedUserList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedUserList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Ticket` PATCHs.
     /// </summary>
-    public async Task<MetaResponse> MetaPatchRetrieveAsync(string id)
+    public async Task<MetaResponse> MetaPatchRetrieveAsync(
+        string id,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = $"ticketing/v1/tickets/meta/patch/{id}"
+                Path = $"ticketing/v1/tickets/meta/patch/{id}",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns metadata for `Ticket` POSTs.
     /// </summary>
-    public async Task<MetaResponse> MetaPostRetrieveAsync()
+    public async Task<MetaResponse> MetaPostRetrieveAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/tickets/meta/post"
+                Path = "ticketing/v1/tickets/meta/post",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<MetaResponse>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<MetaResponse>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a list of `RemoteFieldClass` objects.
     /// </summary>
     public async Task<PaginatedRemoteFieldClassList> RemoteFieldClassesListAsync(
-        TicketsRemoteFieldClassesListRequest request
+        TicketsRemoteFieldClassesListRequest request,
+        RequestOptions? options = null
     )
     {
         var _query = new Dictionary<string, object>() { };
@@ -382,16 +514,30 @@ TicketsRemoteFieldClassesListRequest request
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/tickets/remote-field-classes",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedRemoteFieldClassList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedRemoteFieldClassList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsCollaboratorsListRequestExpand.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsCollaboratorsListRequestExpand.cs
index dc04d0a4..faa38048 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsCollaboratorsListRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsCollaboratorsListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestExpand.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestExpand.cs
index 2e257794..0f324a47 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestPriority.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestPriority.cs
index d4dc155e..7a5d2ae5 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestPriority.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestPriority.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestRemoteFields.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestRemoteFields.cs
index 76cbf3a7..2c8de532 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestRemoteFields.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestShowEnumOrigins.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestShowEnumOrigins.cs
index 05e11600..9ee1d4fe 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestStatus.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestStatus.cs
index 5903abe2..70a5b8f8 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestStatus.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsListRequestStatus.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestExpand.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestExpand.cs
index 57f39173..f9e6709c 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestRemoteFields.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestRemoteFields.cs
index 0301f612..6c8ac56d 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestRemoteFields.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestRemoteFields.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestShowEnumOrigins.cs b/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestShowEnumOrigins.cs
index 2df8e594..6986f9e3 100644
--- a/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestShowEnumOrigins.cs
+++ b/src/Merge.Client/Ticketing/Tickets/Types/TicketsRetrieveRequestShowEnumOrigins.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/AccessLevelEnum.cs b/src/Merge.Client/Ticketing/Types/AccessLevelEnum.cs
index 11310259..24608e0c 100644
--- a/src/Merge.Client/Ticketing/Types/AccessLevelEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/AccessLevelEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/Account.cs b/src/Merge.Client/Ticketing/Types/Account.cs
index f64b910b..3b4115c1 100644
--- a/src/Merge.Client/Ticketing/Types/Account.cs
+++ b/src/Merge.Client/Ticketing/Types/Account.cs
@@ -1,54 +1,53 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Account
+public record Account
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The account's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The account's domain names.
     /// </summary>
     [JsonPropertyName("domains")]
-    public IEnumerable<string>? Domains { get; init; }
+    public IEnumerable<string>? Domains { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AccountDetails.cs b/src/Merge.Client/Ticketing/Types/AccountDetails.cs
index daccbddb..d906db55 100644
--- a/src/Merge.Client/Ticketing/Types/AccountDetails.cs
+++ b/src/Merge.Client/Ticketing/Types/AccountDetails.cs
@@ -1,45 +1,44 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class AccountDetails
+public record AccountDetails
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("integration")]
-    public string? Integration { get; init; }
+    public string? Integration { get; set; }
 
     [JsonPropertyName("integration_slug")]
-    public string? IntegrationSlug { get; init; }
+    public string? IntegrationSlug { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string? EndUserOrganizationName { get; init; }
+    public string? EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string? EndUserEmailAddress { get; init; }
+    public string? EndUserEmailAddress { get; set; }
 
     [JsonPropertyName("status")]
-    public string? Status { get; init; }
+    public string? Status { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string? WebhookListenerUrl { get; init; }
+    public string? WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string? AccountType { get; init; }
+    public string? AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AccountDetailsAndActions.cs b/src/Merge.Client/Ticketing/Types/AccountDetailsAndActions.cs
index 1d801a12..13293a16 100644
--- a/src/Merge.Client/Ticketing/Types/AccountDetailsAndActions.cs
+++ b/src/Merge.Client/Ticketing/Types/AccountDetailsAndActions.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class AccountDetailsAndActions
+public record AccountDetailsAndActions
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("category")]
-    public CategoryEnum? Category { get; init; }
+    public CategoryEnum? Category { get; set; }
 
     [JsonPropertyName("status")]
-    public AccountDetailsAndActionsStatusEnum Status { get; init; }
+    public required AccountDetailsAndActionsStatusEnum Status { get; set; }
 
     [JsonPropertyName("status_detail")]
-    public string? StatusDetail { get; init; }
+    public string? StatusDetail { get; set; }
 
     [JsonPropertyName("end_user_origin_id")]
-    public string? EndUserOriginId { get; init; }
+    public string? EndUserOriginId { get; set; }
 
     [JsonPropertyName("end_user_organization_name")]
-    public string EndUserOrganizationName { get; init; }
+    public required string EndUserOrganizationName { get; set; }
 
     [JsonPropertyName("end_user_email_address")]
-    public string EndUserEmailAddress { get; init; }
+    public required string EndUserEmailAddress { get; set; }
 
     /// <summary>
     /// The tenant or domain the customer has provided access to.
     /// </summary>
     [JsonPropertyName("subdomain")]
-    public string? Subdomain { get; init; }
+    public string? Subdomain { get; set; }
 
     [JsonPropertyName("webhook_listener_url")]
-    public string WebhookListenerUrl { get; init; }
+    public required string WebhookListenerUrl { get; set; }
 
     /// <summary>
     /// Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets.
     /// </summary>
     [JsonPropertyName("is_duplicate")]
-    public bool? IsDuplicate { get; init; }
+    public bool? IsDuplicate { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountDetailsAndActionsIntegration? Integration { get; init; }
+    public AccountDetailsAndActionsIntegration? Integration { get; set; }
 
     [JsonPropertyName("account_type")]
-    public string AccountType { get; init; }
+    public required string AccountType { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AccountDetailsAndActionsIntegration.cs b/src/Merge.Client/Ticketing/Types/AccountDetailsAndActionsIntegration.cs
index e1e98e77..acf21d97 100644
--- a/src/Merge.Client/Ticketing/Types/AccountDetailsAndActionsIntegration.cs
+++ b/src/Merge.Client/Ticketing/Types/AccountDetailsAndActionsIntegration.cs
@@ -1,33 +1,32 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class AccountDetailsAndActionsIntegration
+public record AccountDetailsAndActionsIntegration
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum> Categories { get; init; }
+    public IEnumerable<CategoriesEnum> Categories { get; set; } = new List<CategoriesEnum>();
 
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     [JsonPropertyName("color")]
-    public string Color { get; init; }
+    public required string Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string Slug { get; init; }
+    public required string Slug { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AccountDetailsAndActionsStatusEnum.cs b/src/Merge.Client/Ticketing/Types/AccountDetailsAndActionsStatusEnum.cs
index f7e0e2ab..03350e77 100644
--- a/src/Merge.Client/Ticketing/Types/AccountDetailsAndActionsStatusEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/AccountDetailsAndActionsStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/AccountIntegration.cs b/src/Merge.Client/Ticketing/Types/AccountIntegration.cs
index dc925923..9df0d351 100644
--- a/src/Merge.Client/Ticketing/Types/AccountIntegration.cs
+++ b/src/Merge.Client/Ticketing/Types/AccountIntegration.cs
@@ -1,66 +1,65 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class AccountIntegration
+public record AccountIntegration
 {
     /// <summary>
     /// Company name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// Optional. This shortened name appears in places with limited space, usually in conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example: <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP SuccessFactors)</i>
     /// </summary>
     [JsonPropertyName("abbreviated_name")]
-    public string? AbbreviatedName { get; init; }
+    public string? AbbreviatedName { get; set; }
 
     /// <summary>
     /// Category or categories this integration belongs to. Multiple categories should be comma separated, i.e. [ats, hris].
     /// </summary>
     [JsonPropertyName("categories")]
-    public IEnumerable<CategoriesEnum>? Categories { get; init; }
+    public IEnumerable<CategoriesEnum>? Categories { get; set; }
 
     /// <summary>
     /// Company logo in rectangular shape. <b>Upload an image with a clear background.</b>
     /// </summary>
     [JsonPropertyName("image")]
-    public string? Image { get; init; }
+    public string? Image { get; set; }
 
     /// <summary>
     /// Company logo in square shape. <b>Upload an image with a white background.</b>
     /// </summary>
     [JsonPropertyName("square_image")]
-    public string? SquareImage { get; init; }
+    public string? SquareImage { get; set; }
 
     /// <summary>
     /// The color of this integration used for buttons and text throughout the app and landing pages. <b>Choose a darker, saturated color.</b>
     /// </summary>
     [JsonPropertyName("color")]
-    public string? Color { get; init; }
+    public string? Color { get; set; }
 
     [JsonPropertyName("slug")]
-    public string? Slug { get; init; }
+    public string? Slug { get; set; }
 
     /// <summary>
     /// Mapping of API endpoints to documentation urls for support. Example: {'GET': [['/common-model-scopes', 'https://docs.merge.dev/accounting/common-model-scopes/#common_model_scopes_retrieve'],['/common-model-actions', 'https://docs.merge.dev/accounting/common-model-actions/#common_model_actions_retrieve']], 'POST': []}
     /// </summary>
     [JsonPropertyName("api_endpoints_to_documentation_urls")]
-    public Dictionary<string, object>? ApiEndpointsToDocumentationUrls { get; init; }
+    public Dictionary<string, object?>? ApiEndpointsToDocumentationUrls { get; set; }
 
     /// <summary>
     /// Setup guide URL for third party webhook creation. Exposed in Merge Docs.
     /// </summary>
     [JsonPropertyName("webhook_setup_guide_url")]
-    public string? WebhookSetupGuideUrl { get; init; }
+    public string? WebhookSetupGuideUrl { get; set; }
 
     /// <summary>
     /// Category or categories this integration is in beta status for.
     /// </summary>
     [JsonPropertyName("category_beta_status")]
-    public Dictionary<string, object>? CategoryBetaStatus { get; init; }
+    public Dictionary<string, object?>? CategoryBetaStatus { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AccountToken.cs b/src/Merge.Client/Ticketing/Types/AccountToken.cs
index b82b9e4e..abff3507 100644
--- a/src/Merge.Client/Ticketing/Types/AccountToken.cs
+++ b/src/Merge.Client/Ticketing/Types/AccountToken.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class AccountToken
+public record AccountToken
 {
     [JsonPropertyName("account_token")]
-    public string AccountToken_ { get; init; }
+    public required string AccountToken_ { get; set; }
 
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AdvancedMetadata.cs b/src/Merge.Client/Ticketing/Types/AdvancedMetadata.cs
index 81dc6626..26141ab5 100644
--- a/src/Merge.Client/Ticketing/Types/AdvancedMetadata.cs
+++ b/src/Merge.Client/Ticketing/Types/AdvancedMetadata.cs
@@ -4,23 +4,23 @@
 
 namespace Merge.Client.Ticketing;
 
-public class AdvancedMetadata
+public record AdvancedMetadata
 {
     [JsonPropertyName("id")]
-    public string Id { get; init; }
+    public required string Id { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("is_custom")]
-    public bool? IsCustom { get; init; }
+    public bool? IsCustom { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<object>? FieldChoices { get; init; }
+    public IEnumerable<object>? FieldChoices { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AsyncPassthroughReciept.cs b/src/Merge.Client/Ticketing/Types/AsyncPassthroughReciept.cs
index d177f468..48717831 100644
--- a/src/Merge.Client/Ticketing/Types/AsyncPassthroughReciept.cs
+++ b/src/Merge.Client/Ticketing/Types/AsyncPassthroughReciept.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Ticketing;
 
-public class AsyncPassthroughReciept
+public record AsyncPassthroughReciept
 {
     [JsonPropertyName("async_passthrough_receipt_id")]
-    public string AsyncPassthroughReceiptId { get; init; }
+    public required string AsyncPassthroughReceiptId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/Attachment.cs b/src/Merge.Client/Ticketing/Types/Attachment.cs
index 2e925b38..ab587168 100644
--- a/src/Merge.Client/Ticketing/Types/Attachment.cs
+++ b/src/Merge.Client/Ticketing/Types/Attachment.cs
@@ -1,78 +1,77 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Attachment
+public record Attachment
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The attachment's name. It is required to include the file extension in the attachment's name.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The ticket associated with the attachment.
     /// </summary>
     [JsonPropertyName("ticket")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Ticket>>))]
-    public OneOf<string, Ticket>? Ticket { get; init; }
+    public OneOf<string, Ticket>? Ticket { get; set; }
 
     /// <summary>
     /// The attachment's url. It is required to include the file extension in the file's URL.
     /// </summary>
     [JsonPropertyName("file_url")]
-    public string? FileUrl { get; init; }
+    public string? FileUrl { get; set; }
 
     /// <summary>
     /// The attachment's file format.
     /// </summary>
     [JsonPropertyName("content_type")]
-    public string? ContentType { get; init; }
+    public string? ContentType { get; set; }
 
     /// <summary>
     /// The user who uploaded the attachment.
     /// </summary>
     [JsonPropertyName("uploaded_by")]
-    public string? UploadedBy { get; init; }
+    public string? UploadedBy { get; set; }
 
     /// <summary>
     /// When the third party's attachment was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AttachmentRequest.cs b/src/Merge.Client/Ticketing/Types/AttachmentRequest.cs
index 2fcacf37..c50af590 100644
--- a/src/Merge.Client/Ticketing/Types/AttachmentRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/AttachmentRequest.cs
@@ -1,48 +1,47 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class AttachmentRequest
+public record AttachmentRequest
 {
     /// <summary>
     /// The attachment's name. It is required to include the file extension in the attachment's name.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The ticket associated with the attachment.
     /// </summary>
     [JsonPropertyName("ticket")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Ticket>>))]
-    public OneOf<string, Ticket>? Ticket { get; init; }
+    public OneOf<string, Ticket>? Ticket { get; set; }
 
     /// <summary>
     /// The attachment's url. It is required to include the file extension in the file's URL.
     /// </summary>
     [JsonPropertyName("file_url")]
-    public string? FileUrl { get; init; }
+    public string? FileUrl { get; set; }
 
     /// <summary>
     /// The attachment's file format.
     /// </summary>
     [JsonPropertyName("content_type")]
-    public string? ContentType { get; init; }
+    public string? ContentType { get; set; }
 
     /// <summary>
     /// The user who uploaded the attachment.
     /// </summary>
     [JsonPropertyName("uploaded_by")]
-    public string? UploadedBy { get; init; }
+    public string? UploadedBy { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AuditLogEvent.cs b/src/Merge.Client/Ticketing/Types/AuditLogEvent.cs
index 0db65c84..d34c2502 100644
--- a/src/Merge.Client/Ticketing/Types/AuditLogEvent.cs
+++ b/src/Merge.Client/Ticketing/Types/AuditLogEvent.cs
@@ -1,26 +1,25 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class AuditLogEvent
+public record AuditLogEvent
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The User's full name at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_name")]
-    public string? UserName { get; init; }
+    public string? UserName { get; set; }
 
     /// <summary>
     /// The User's email at the time of this Event occurring.
     /// </summary>
     [JsonPropertyName("user_email")]
-    public string? UserEmail { get; init; }
+    public string? UserEmail { get; set; }
 
     /// <summary>
     /// Designates the role of the user (or SYSTEM/API if action not taken by a user) at the time of this Event occurring.
@@ -33,10 +32,10 @@ public class AuditLogEvent
     /// - `MERGE_TEAM` - MERGE_TEAM
     /// </summary>
     [JsonPropertyName("role")]
-    public RoleEnum Role { get; init; }
+    public required RoleEnum Role { get; set; }
 
     [JsonPropertyName("ip_address")]
-    public string IpAddress { get; init; }
+    public required string IpAddress { get; set; }
 
     /// <summary>
     /// Designates the type of event that occurred.
@@ -81,11 +80,11 @@ public class AuditLogEvent
     /// - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
     /// </summary>
     [JsonPropertyName("event_type")]
-    public EventTypeEnum EventType { get; init; }
+    public required EventTypeEnum EventType { get; set; }
 
     [JsonPropertyName("event_description")]
-    public string EventDescription { get; init; }
+    public required string EventDescription { get; set; }
 
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/AvailableActions.cs b/src/Merge.Client/Ticketing/Types/AvailableActions.cs
index d1870272..7e100a4e 100644
--- a/src/Merge.Client/Ticketing/Types/AvailableActions.cs
+++ b/src/Merge.Client/Ticketing/Types/AvailableActions.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class AvailableActions
+public record AvailableActions
 {
     [JsonPropertyName("integration")]
-    public AccountIntegration Integration { get; init; }
+    public required AccountIntegration Integration { get; set; }
 
     [JsonPropertyName("passthrough_available")]
-    public bool PassthroughAvailable { get; init; }
+    public required bool PassthroughAvailable { get; set; }
 
     [JsonPropertyName("available_model_operations")]
-    public IEnumerable<ModelOperation>? AvailableModelOperations { get; init; }
+    public IEnumerable<ModelOperation>? AvailableModelOperations { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/CategoriesEnum.cs b/src/Merge.Client/Ticketing/Types/CategoriesEnum.cs
index a943641b..faa85b29 100644
--- a/src/Merge.Client/Ticketing/Types/CategoriesEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/CategoriesEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/CategoryEnum.cs b/src/Merge.Client/Ticketing/Types/CategoryEnum.cs
index fab6a60e..f6c6b672 100644
--- a/src/Merge.Client/Ticketing/Types/CategoryEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/CategoryEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/Collection.cs b/src/Merge.Client/Ticketing/Types/Collection.cs
index 39ab8e4b..ad163c33 100644
--- a/src/Merge.Client/Ticketing/Types/Collection.cs
+++ b/src/Merge.Client/Ticketing/Types/Collection.cs
@@ -1,46 +1,45 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Collection
+public record Collection
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The collection's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The collection's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// The collection's type.
@@ -49,20 +48,20 @@ public class Collection
     /// - `PROJECT` - PROJECT
     /// </summary>
     [JsonPropertyName("collection_type")]
-    public CollectionTypeEnum? CollectionType { get; init; }
+    public CollectionTypeEnum? CollectionType { get; set; }
 
     /// <summary>
     /// The parent collection for this collection.
     /// </summary>
     [JsonPropertyName("parent_collection")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Collection>>))]
-    public OneOf<string, Collection>? ParentCollection { get; init; }
+    public OneOf<string, Collection>? ParentCollection { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The level of access a User has to the Collection and its sub-objects.
@@ -72,11 +71,11 @@ public class Collection
     /// - `PUBLIC` - PUBLIC
     /// </summary>
     [JsonPropertyName("access_level")]
-    public AccessLevelEnum? AccessLevel { get; init; }
+    public AccessLevelEnum? AccessLevel { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/CollectionTypeEnum.cs b/src/Merge.Client/Ticketing/Types/CollectionTypeEnum.cs
index 75ed1572..25bc1a79 100644
--- a/src/Merge.Client/Ticketing/Types/CollectionTypeEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/CollectionTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/Comment.cs b/src/Merge.Client/Ticketing/Types/Comment.cs
index 8b306d49..88ad1701 100644
--- a/src/Merge.Client/Ticketing/Types/Comment.cs
+++ b/src/Merge.Client/Ticketing/Types/Comment.cs
@@ -1,86 +1,85 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Comment
+public record Comment
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The author of the Comment, if the author is a User.
     /// </summary>
     [JsonPropertyName("user")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? User { get; init; }
+    public OneOf<string, User>? User { get; set; }
 
     /// <summary>
     /// The author of the Comment, if the author is a Contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The comment's text body.
     /// </summary>
     [JsonPropertyName("body")]
-    public string? Body { get; init; }
+    public string? Body { get; set; }
 
     /// <summary>
     /// The comment's text body formatted as html.
     /// </summary>
     [JsonPropertyName("html_body")]
-    public string? HtmlBody { get; init; }
+    public string? HtmlBody { get; set; }
 
     /// <summary>
     /// The ticket associated with the comment.
     /// </summary>
     [JsonPropertyName("ticket")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Ticket>>))]
-    public OneOf<string, Ticket>? Ticket { get; init; }
+    public OneOf<string, Ticket>? Ticket { get; set; }
 
     /// <summary>
     /// Whether or not the comment is internal.
     /// </summary>
     [JsonPropertyName("is_private")]
-    public bool? IsPrivate { get; init; }
+    public bool? IsPrivate { get; set; }
 
     /// <summary>
     /// When the third party's comment was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/CommentRequest.cs b/src/Merge.Client/Ticketing/Types/CommentRequest.cs
index 7ac6bd38..f733305a 100644
--- a/src/Merge.Client/Ticketing/Types/CommentRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/CommentRequest.cs
@@ -1,56 +1,55 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class CommentRequest
+public record CommentRequest
 {
     /// <summary>
     /// The author of the Comment, if the author is a User.
     /// </summary>
     [JsonPropertyName("user")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? User { get; init; }
+    public OneOf<string, User>? User { get; set; }
 
     /// <summary>
     /// The author of the Comment, if the author is a Contact.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The comment's text body.
     /// </summary>
     [JsonPropertyName("body")]
-    public string? Body { get; init; }
+    public string? Body { get; set; }
 
     /// <summary>
     /// The comment's text body formatted as html.
     /// </summary>
     [JsonPropertyName("html_body")]
-    public string? HtmlBody { get; init; }
+    public string? HtmlBody { get; set; }
 
     /// <summary>
     /// The ticket associated with the comment.
     /// </summary>
     [JsonPropertyName("ticket")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Ticket>>))]
-    public OneOf<string, Ticket>? Ticket { get; init; }
+    public OneOf<string, Ticket>? Ticket { get; set; }
 
     /// <summary>
     /// Whether or not the comment is internal.
     /// </summary>
     [JsonPropertyName("is_private")]
-    public bool? IsPrivate { get; init; }
+    public bool? IsPrivate { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/CommentResponse.cs b/src/Merge.Client/Ticketing/Types/CommentResponse.cs
index 8fb6ff9b..5d8562ac 100644
--- a/src/Merge.Client/Ticketing/Types/CommentResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/CommentResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class CommentResponse
+public record CommentResponse
 {
     [JsonPropertyName("model")]
-    public Comment Model { get; init; }
+    public required Comment Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/CommonModelScopeApi.cs b/src/Merge.Client/Ticketing/Types/CommonModelScopeApi.cs
index eb0eba2c..1ad78a19 100644
--- a/src/Merge.Client/Ticketing/Types/CommonModelScopeApi.cs
+++ b/src/Merge.Client/Ticketing/Types/CommonModelScopeApi.cs
@@ -1,15 +1,15 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class CommonModelScopeApi
+public record CommonModelScopeApi
 {
     /// <summary>
     /// The common models you want to update the scopes for
     /// </summary>
     [JsonPropertyName("common_models")]
-    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; init; }
+    public IEnumerable<IndividualCommonModelScopeDeserializer> CommonModels { get; set; } =
+        new List<IndividualCommonModelScopeDeserializer>();
 }
diff --git a/src/Merge.Client/Ticketing/Types/CommonModelScopesBodyRequest.cs b/src/Merge.Client/Ticketing/Types/CommonModelScopesBodyRequest.cs
index cd4db67d..80275ea1 100644
--- a/src/Merge.Client/Ticketing/Types/CommonModelScopesBodyRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/CommonModelScopesBodyRequest.cs
@@ -1,18 +1,18 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class CommonModelScopesBodyRequest
+public record CommonModelScopesBodyRequest
 {
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("enabled_actions")]
-    public IEnumerable<EnabledActionsEnum> EnabledActions { get; init; }
+    public IEnumerable<EnabledActionsEnum> EnabledActions { get; set; } =
+        new List<EnabledActionsEnum>();
 
     [JsonPropertyName("disabled_fields")]
-    public IEnumerable<string> DisabledFields { get; init; }
+    public IEnumerable<string> DisabledFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Ticketing/Types/Contact.cs b/src/Merge.Client/Ticketing/Types/Contact.cs
index 1042f731..c08f783e 100644
--- a/src/Merge.Client/Ticketing/Types/Contact.cs
+++ b/src/Merge.Client/Ticketing/Types/Contact.cs
@@ -1,75 +1,74 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Contact
+public record Contact
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The contact's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The contact's email address.
     /// </summary>
     [JsonPropertyName("email_address")]
-    public string? EmailAddress { get; init; }
+    public string? EmailAddress { get; set; }
 
     /// <summary>
     /// The contact's phone number.
     /// </summary>
     [JsonPropertyName("phone_number")]
-    public string? PhoneNumber { get; init; }
+    public string? PhoneNumber { get; set; }
 
     /// <summary>
     /// The contact's details.
     /// </summary>
     [JsonPropertyName("details")]
-    public string? Details { get; init; }
+    public string? Details { get; set; }
 
     /// <summary>
     /// The contact's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/ContactRequest.cs b/src/Merge.Client/Ticketing/Types/ContactRequest.cs
index 7e3aa517..a5f7c175 100644
--- a/src/Merge.Client/Ticketing/Types/ContactRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/ContactRequest.cs
@@ -1,48 +1,47 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class ContactRequest
+public record ContactRequest
 {
     /// <summary>
     /// The contact's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The contact's email address.
     /// </summary>
     [JsonPropertyName("email_address")]
-    public string? EmailAddress { get; init; }
+    public string? EmailAddress { get; set; }
 
     /// <summary>
     /// The contact's phone number.
     /// </summary>
     [JsonPropertyName("phone_number")]
-    public string? PhoneNumber { get; init; }
+    public string? PhoneNumber { get; set; }
 
     /// <summary>
     /// The contact's details.
     /// </summary>
     [JsonPropertyName("details")]
-    public string? Details { get; init; }
+    public string? Details { get; set; }
 
     /// <summary>
     /// The contact's account.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/DataPassthroughRequest.cs b/src/Merge.Client/Ticketing/Types/DataPassthroughRequest.cs
index 5a6830ab..c1d76125 100644
--- a/src/Merge.Client/Ticketing/Types/DataPassthroughRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/DataPassthroughRequest.cs
@@ -1,51 +1,50 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class DataPassthroughRequest
+public record DataPassthroughRequest
 {
     [JsonPropertyName("method")]
-    public MethodEnum Method { get; init; }
+    public required MethodEnum Method { get; set; }
 
     /// <summary>
     /// The path of the request in the third party's platform.
     /// </summary>
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     /// <summary>
     /// An optional override of the third party's base url for the request.
     /// </summary>
     [JsonPropertyName("base_url_override")]
-    public string? BaseUrlOverride { get; init; }
+    public string? BaseUrlOverride { get; set; }
 
     /// <summary>
     /// The data with the request. You must include a `request_format` parameter matching the data's format
     /// </summary>
     [JsonPropertyName("data")]
-    public string? Data { get; init; }
+    public string? Data { get; set; }
 
     /// <summary>
     /// Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`.
     /// </summary>
     [JsonPropertyName("multipart_form_data")]
-    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; init; }
+    public IEnumerable<MultipartFormFieldRequest>? MultipartFormData { get; set; }
 
     /// <summary>
     /// The headers to use for the request (Merge will handle the account's authorization headers). `Content-Type` header is required for passthrough. Choose content type corresponding to expected format of receiving server.
     /// </summary>
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 
     [JsonPropertyName("request_format")]
-    public RequestFormatEnum? RequestFormat { get; init; }
+    public RequestFormatEnum? RequestFormat { get; set; }
 
     /// <summary>
     /// Optional. If true, the response will always be an object of the form `{"type": T, "value": ...}` where `T` will be one of `string, boolean, number, null, array, object`.
     /// </summary>
     [JsonPropertyName("normalize_response")]
-    public bool? NormalizeResponse { get; init; }
+    public bool? NormalizeResponse { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/DebugModeLog.cs b/src/Merge.Client/Ticketing/Types/DebugModeLog.cs
index e3cb90eb..b10132ff 100644
--- a/src/Merge.Client/Ticketing/Types/DebugModeLog.cs
+++ b/src/Merge.Client/Ticketing/Types/DebugModeLog.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class DebugModeLog
+public record DebugModeLog
 {
     [JsonPropertyName("log_id")]
-    public string LogId { get; init; }
+    public required string LogId { get; set; }
 
     [JsonPropertyName("dashboard_view")]
-    public string DashboardView { get; init; }
+    public required string DashboardView { get; set; }
 
     [JsonPropertyName("log_summary")]
-    public DebugModelLogSummary LogSummary { get; init; }
+    public required DebugModelLogSummary LogSummary { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/DebugModelLogSummary.cs b/src/Merge.Client/Ticketing/Types/DebugModelLogSummary.cs
index 67bca8a1..51a9877a 100644
--- a/src/Merge.Client/Ticketing/Types/DebugModelLogSummary.cs
+++ b/src/Merge.Client/Ticketing/Types/DebugModelLogSummary.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ticketing;
 
-public class DebugModelLogSummary
+public record DebugModelLogSummary
 {
     [JsonPropertyName("url")]
-    public string Url { get; init; }
+    public required string Url { get; set; }
 
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("status_code")]
-    public int StatusCode { get; init; }
+    public required int StatusCode { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/EnabledActionsEnum.cs b/src/Merge.Client/Ticketing/Types/EnabledActionsEnum.cs
index 120643f3..ddcde5e4 100644
--- a/src/Merge.Client/Ticketing/Types/EnabledActionsEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/EnabledActionsEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/EncodingEnum.cs b/src/Merge.Client/Ticketing/Types/EncodingEnum.cs
index ab60c628..d81344c4 100644
--- a/src/Merge.Client/Ticketing/Types/EncodingEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/EncodingEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/ErrorValidationProblem.cs b/src/Merge.Client/Ticketing/Types/ErrorValidationProblem.cs
index e9ba3a27..5bed9363 100644
--- a/src/Merge.Client/Ticketing/Types/ErrorValidationProblem.cs
+++ b/src/Merge.Client/Ticketing/Types/ErrorValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class ErrorValidationProblem
+public record ErrorValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/EventTypeEnum.cs b/src/Merge.Client/Ticketing/Types/EventTypeEnum.cs
index 3a4322a0..e06adfd4 100644
--- a/src/Merge.Client/Ticketing/Types/EventTypeEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/EventTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/ExternalTargetFieldApi.cs b/src/Merge.Client/Ticketing/Types/ExternalTargetFieldApi.cs
index db2b5521..3f785c04 100644
--- a/src/Merge.Client/Ticketing/Types/ExternalTargetFieldApi.cs
+++ b/src/Merge.Client/Ticketing/Types/ExternalTargetFieldApi.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ticketing;
 
-public class ExternalTargetFieldApi
+public record ExternalTargetFieldApi
 {
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_mapped")]
-    public string? IsMapped { get; init; }
+    public string? IsMapped { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/ExternalTargetFieldApiResponse.cs b/src/Merge.Client/Ticketing/Types/ExternalTargetFieldApiResponse.cs
index 177b8c70..4c254fbb 100644
--- a/src/Merge.Client/Ticketing/Types/ExternalTargetFieldApiResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/ExternalTargetFieldApiResponse.cs
@@ -1,42 +1,41 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class ExternalTargetFieldApiResponse
+public record ExternalTargetFieldApiResponse
 {
     [JsonPropertyName("Ticket")]
-    public IEnumerable<ExternalTargetFieldApi>? Ticket { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Ticket { get; set; }
 
     [JsonPropertyName("Comment")]
-    public IEnumerable<ExternalTargetFieldApi>? Comment { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Comment { get; set; }
 
     [JsonPropertyName("Project")]
-    public IEnumerable<ExternalTargetFieldApi>? Project { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Project { get; set; }
 
     [JsonPropertyName("Collection")]
-    public IEnumerable<ExternalTargetFieldApi>? Collection { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Collection { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<ExternalTargetFieldApi>? User { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? User { get; set; }
 
     [JsonPropertyName("Role")]
-    public IEnumerable<ExternalTargetFieldApi>? Role { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Role { get; set; }
 
     [JsonPropertyName("Account")]
-    public IEnumerable<ExternalTargetFieldApi>? Account { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Account { get; set; }
 
     [JsonPropertyName("Team")]
-    public IEnumerable<ExternalTargetFieldApi>? Team { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Team { get; set; }
 
     [JsonPropertyName("Attachment")]
-    public IEnumerable<ExternalTargetFieldApi>? Attachment { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Attachment { get; set; }
 
     [JsonPropertyName("Tag")]
-    public IEnumerable<ExternalTargetFieldApi>? Tag { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Tag { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<ExternalTargetFieldApi>? Contact { get; init; }
+    public IEnumerable<ExternalTargetFieldApi>? Contact { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldFormatEnum.cs b/src/Merge.Client/Ticketing/Types/FieldFormatEnum.cs
index ef0fd1dd..ec9cbd7d 100644
--- a/src/Merge.Client/Ticketing/Types/FieldFormatEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldFormatEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstance.cs b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstance.cs
index b59a2e69..eed7839e 100644
--- a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstance.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstance.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class FieldMappingApiInstance
+public record FieldMappingApiInstance
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("is_integration_wide")]
-    public bool? IsIntegrationWide { get; init; }
+    public bool? IsIntegrationWide { get; set; }
 
     [JsonPropertyName("target_field")]
-    public FieldMappingApiInstanceTargetField? TargetField { get; init; }
+    public FieldMappingApiInstanceTargetField? TargetField { get; set; }
 
     [JsonPropertyName("remote_field")]
-    public FieldMappingApiInstanceRemoteField? RemoteField { get; init; }
+    public FieldMappingApiInstanceRemoteField? RemoteField { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceRemoteField.cs b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceRemoteField.cs
index a0eb677f..80fd0f98 100644
--- a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceRemoteField.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceRemoteField.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class FieldMappingApiInstanceRemoteField
+public record FieldMappingApiInstanceRemoteField
 {
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_endpoint_info")]
-    public FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo RemoteEndpointInfo { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
index db1ec755..74052074 100644
--- a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ticketing;
 
-public class FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
+public record FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string? Method { get; init; }
+    public string? Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string? UrlPath { get; init; }
+    public string? UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<string>? FieldTraversalPath { get; init; }
+    public IEnumerable<string>? FieldTraversalPath { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceResponse.cs b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceResponse.cs
index 003fdcd6..02f3f690 100644
--- a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceResponse.cs
@@ -1,42 +1,41 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class FieldMappingApiInstanceResponse
+public record FieldMappingApiInstanceResponse
 {
     [JsonPropertyName("Ticket")]
-    public IEnumerable<FieldMappingApiInstance>? Ticket { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Ticket { get; set; }
 
     [JsonPropertyName("Comment")]
-    public IEnumerable<FieldMappingApiInstance>? Comment { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Comment { get; set; }
 
     [JsonPropertyName("Project")]
-    public IEnumerable<FieldMappingApiInstance>? Project { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Project { get; set; }
 
     [JsonPropertyName("Collection")]
-    public IEnumerable<FieldMappingApiInstance>? Collection { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Collection { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<FieldMappingApiInstance>? User { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? User { get; set; }
 
     [JsonPropertyName("Role")]
-    public IEnumerable<FieldMappingApiInstance>? Role { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Role { get; set; }
 
     [JsonPropertyName("Account")]
-    public IEnumerable<FieldMappingApiInstance>? Account { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Account { get; set; }
 
     [JsonPropertyName("Team")]
-    public IEnumerable<FieldMappingApiInstance>? Team { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Team { get; set; }
 
     [JsonPropertyName("Attachment")]
-    public IEnumerable<FieldMappingApiInstance>? Attachment { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Attachment { get; set; }
 
     [JsonPropertyName("Tag")]
-    public IEnumerable<FieldMappingApiInstance>? Tag { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Tag { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<FieldMappingApiInstance>? Contact { get; init; }
+    public IEnumerable<FieldMappingApiInstance>? Contact { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceTargetField.cs b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceTargetField.cs
index 3f5f1f28..46e88393 100644
--- a/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceTargetField.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldMappingApiInstanceTargetField.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ticketing;
 
-public class FieldMappingApiInstanceTargetField
+public record FieldMappingApiInstanceTargetField
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("description")]
-    public string Description { get; init; }
+    public required string Description { get; set; }
 
     [JsonPropertyName("is_organization_wide")]
-    public bool IsOrganizationWide { get; init; }
+    public required bool IsOrganizationWide { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldMappingInstanceResponse.cs b/src/Merge.Client/Ticketing/Types/FieldMappingInstanceResponse.cs
index 413176c8..894bbd2c 100644
--- a/src/Merge.Client/Ticketing/Types/FieldMappingInstanceResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldMappingInstanceResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class FieldMappingInstanceResponse
+public record FieldMappingInstanceResponse
 {
     [JsonPropertyName("model")]
-    public FieldMappingApiInstance Model { get; init; }
+    public required FieldMappingApiInstance Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldPermissionDeserializer.cs b/src/Merge.Client/Ticketing/Types/FieldPermissionDeserializer.cs
index 34c80472..d4b4a0b2 100644
--- a/src/Merge.Client/Ticketing/Types/FieldPermissionDeserializer.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldPermissionDeserializer.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ticketing;
 
-public class FieldPermissionDeserializer
+public record FieldPermissionDeserializer
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldPermissionDeserializerRequest.cs b/src/Merge.Client/Ticketing/Types/FieldPermissionDeserializerRequest.cs
index 529be0c3..310b57c2 100644
--- a/src/Merge.Client/Ticketing/Types/FieldPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldPermissionDeserializerRequest.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ticketing;
 
-public class FieldPermissionDeserializerRequest
+public record FieldPermissionDeserializerRequest
 {
     [JsonPropertyName("enabled")]
-    public IEnumerable<object>? Enabled { get; init; }
+    public IEnumerable<object>? Enabled { get; set; }
 
     [JsonPropertyName("disabled")]
-    public IEnumerable<object>? Disabled { get; init; }
+    public IEnumerable<object>? Disabled { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/FieldTypeEnum.cs b/src/Merge.Client/Ticketing/Types/FieldTypeEnum.cs
index cdde30af..4ca06179 100644
--- a/src/Merge.Client/Ticketing/Types/FieldTypeEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/FieldTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/IndividualCommonModelScopeDeserializer.cs b/src/Merge.Client/Ticketing/Types/IndividualCommonModelScopeDeserializer.cs
index 2ee89da1..1581b893 100644
--- a/src/Merge.Client/Ticketing/Types/IndividualCommonModelScopeDeserializer.cs
+++ b/src/Merge.Client/Ticketing/Types/IndividualCommonModelScopeDeserializer.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class IndividualCommonModelScopeDeserializer
+public record IndividualCommonModelScopeDeserializer
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializer>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializer? FieldPermissions { get; init; }
+    public FieldPermissionDeserializer? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/IndividualCommonModelScopeDeserializerRequest.cs b/src/Merge.Client/Ticketing/Types/IndividualCommonModelScopeDeserializerRequest.cs
index a6556b2c..499facf2 100644
--- a/src/Merge.Client/Ticketing/Types/IndividualCommonModelScopeDeserializerRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/IndividualCommonModelScopeDeserializerRequest.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class IndividualCommonModelScopeDeserializerRequest
+public record IndividualCommonModelScopeDeserializerRequest
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_permissions")]
-    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; init; }
+    public Dictionary<string, ModelPermissionDeserializerRequest>? ModelPermissions { get; set; }
 
     [JsonPropertyName("field_permissions")]
-    public FieldPermissionDeserializerRequest? FieldPermissions { get; init; }
+    public FieldPermissionDeserializerRequest? FieldPermissions { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/Issue.cs b/src/Merge.Client/Ticketing/Types/Issue.cs
index ab869ae3..c8c5e12d 100644
--- a/src/Merge.Client/Ticketing/Types/Issue.cs
+++ b/src/Merge.Client/Ticketing/Types/Issue.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Issue
+public record Issue
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// Status of the issue. Options: ('ONGOING', 'RESOLVED')
@@ -17,23 +16,23 @@ public class Issue
     /// - `RESOLVED` - RESOLVED
     /// </summary>
     [JsonPropertyName("status")]
-    public IssueStatusEnum? Status { get; init; }
+    public IssueStatusEnum? Status { get; set; }
 
     [JsonPropertyName("error_description")]
-    public string ErrorDescription { get; init; }
+    public required string ErrorDescription { get; set; }
 
     [JsonPropertyName("end_user")]
-    public Dictionary<string, object>? EndUser { get; init; }
+    public Dictionary<string, object?>? EndUser { get; set; }
 
     [JsonPropertyName("first_incident_time")]
-    public DateTime? FirstIncidentTime { get; init; }
+    public DateTime? FirstIncidentTime { get; set; }
 
     [JsonPropertyName("last_incident_time")]
-    public DateTime? LastIncidentTime { get; init; }
+    public DateTime? LastIncidentTime { get; set; }
 
     [JsonPropertyName("is_muted")]
-    public bool? IsMuted { get; init; }
+    public bool? IsMuted { get; set; }
 
     [JsonPropertyName("error_details")]
-    public IEnumerable<string>? ErrorDetails { get; init; }
+    public IEnumerable<string>? ErrorDetails { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/IssueStatusEnum.cs b/src/Merge.Client/Ticketing/Types/IssueStatusEnum.cs
index e8bd8048..aebfdadb 100644
--- a/src/Merge.Client/Ticketing/Types/IssueStatusEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/IssueStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/ItemFormatEnum.cs b/src/Merge.Client/Ticketing/Types/ItemFormatEnum.cs
index b7f8fdb0..f126096a 100644
--- a/src/Merge.Client/Ticketing/Types/ItemFormatEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/ItemFormatEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/ItemSchema.cs b/src/Merge.Client/Ticketing/Types/ItemSchema.cs
index 8cbdcba6..d1d2e22f 100644
--- a/src/Merge.Client/Ticketing/Types/ItemSchema.cs
+++ b/src/Merge.Client/Ticketing/Types/ItemSchema.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class ItemSchema
+public record ItemSchema
 {
     [JsonPropertyName("item_type")]
-    public ItemTypeEnum? ItemType { get; init; }
+    public ItemTypeEnum? ItemType { get; set; }
 
     [JsonPropertyName("item_format")]
-    public ItemFormatEnum? ItemFormat { get; init; }
+    public ItemFormatEnum? ItemFormat { get; set; }
 
     [JsonPropertyName("item_choices")]
-    public IEnumerable<string>? ItemChoices { get; init; }
+    public IEnumerable<string>? ItemChoices { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/ItemTypeEnum.cs b/src/Merge.Client/Ticketing/Types/ItemTypeEnum.cs
index 48f0fa2f..ed628ef0 100644
--- a/src/Merge.Client/Ticketing/Types/ItemTypeEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/ItemTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/LinkToken.cs b/src/Merge.Client/Ticketing/Types/LinkToken.cs
index 6e7cf0cc..104d3509 100644
--- a/src/Merge.Client/Ticketing/Types/LinkToken.cs
+++ b/src/Merge.Client/Ticketing/Types/LinkToken.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ticketing;
 
-public class LinkToken
+public record LinkToken
 {
     [JsonPropertyName("link_token")]
-    public string LinkToken_ { get; init; }
+    public required string LinkToken_ { get; set; }
 
     [JsonPropertyName("integration_name")]
-    public string? IntegrationName { get; init; }
+    public string? IntegrationName { get; set; }
 
     [JsonPropertyName("magic_link_url")]
-    public string? MagicLinkUrl { get; init; }
+    public string? MagicLinkUrl { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/LinkedAccountStatus.cs b/src/Merge.Client/Ticketing/Types/LinkedAccountStatus.cs
index 05a3716a..6bb60f29 100644
--- a/src/Merge.Client/Ticketing/Types/LinkedAccountStatus.cs
+++ b/src/Merge.Client/Ticketing/Types/LinkedAccountStatus.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ticketing;
 
-public class LinkedAccountStatus
+public record LinkedAccountStatus
 {
     [JsonPropertyName("linked_account_status")]
-    public string LinkedAccountStatus_ { get; init; }
+    public required string LinkedAccountStatus_ { get; set; }
 
     [JsonPropertyName("can_make_request")]
-    public bool CanMakeRequest { get; init; }
+    public required bool CanMakeRequest { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/MetaResponse.cs b/src/Merge.Client/Ticketing/Types/MetaResponse.cs
index 92be8cbd..23cde483 100644
--- a/src/Merge.Client/Ticketing/Types/MetaResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/MetaResponse.cs
@@ -1,24 +1,24 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class MetaResponse
+public record MetaResponse
 {
     [JsonPropertyName("request_schema")]
-    public Dictionary<string, object> RequestSchema { get; init; }
+    public Dictionary<string, object?> RequestSchema { get; set; } =
+        new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_field_classes")]
-    public Dictionary<string, object>? RemoteFieldClasses { get; init; }
+    public Dictionary<string, object?>? RemoteFieldClasses { get; set; }
 
     [JsonPropertyName("status")]
-    public LinkedAccountStatus? Status { get; init; }
+    public LinkedAccountStatus? Status { get; set; }
 
     [JsonPropertyName("has_conditional_params")]
-    public bool HasConditionalParams { get; init; }
+    public required bool HasConditionalParams { get; set; }
 
     [JsonPropertyName("has_required_linked_account_params")]
-    public bool HasRequiredLinkedAccountParams { get; init; }
+    public required bool HasRequiredLinkedAccountParams { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/MethodEnum.cs b/src/Merge.Client/Ticketing/Types/MethodEnum.cs
index 19c57d52..a36db493 100644
--- a/src/Merge.Client/Ticketing/Types/MethodEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/MethodEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/ModelOperation.cs b/src/Merge.Client/Ticketing/Types/ModelOperation.cs
index 04cd88e4..67cda139 100644
--- a/src/Merge.Client/Ticketing/Types/ModelOperation.cs
+++ b/src/Merge.Client/Ticketing/Types/ModelOperation.cs
@@ -4,17 +4,17 @@
 
 namespace Merge.Client.Ticketing;
 
-public class ModelOperation
+public record ModelOperation
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("available_operations")]
-    public IEnumerable<string> AvailableOperations { get; init; }
+    public IEnumerable<string> AvailableOperations { get; set; } = new List<string>();
 
     [JsonPropertyName("required_post_parameters")]
-    public IEnumerable<string> RequiredPostParameters { get; init; }
+    public IEnumerable<string> RequiredPostParameters { get; set; } = new List<string>();
 
     [JsonPropertyName("supported_fields")]
-    public IEnumerable<string> SupportedFields { get; init; }
+    public IEnumerable<string> SupportedFields { get; set; } = new List<string>();
 }
diff --git a/src/Merge.Client/Ticketing/Types/ModelPermissionDeserializer.cs b/src/Merge.Client/Ticketing/Types/ModelPermissionDeserializer.cs
index 646f1ea3..32e2005b 100644
--- a/src/Merge.Client/Ticketing/Types/ModelPermissionDeserializer.cs
+++ b/src/Merge.Client/Ticketing/Types/ModelPermissionDeserializer.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Ticketing;
 
-public class ModelPermissionDeserializer
+public record ModelPermissionDeserializer
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/ModelPermissionDeserializerRequest.cs b/src/Merge.Client/Ticketing/Types/ModelPermissionDeserializerRequest.cs
index 9dac96a8..24bdfdb8 100644
--- a/src/Merge.Client/Ticketing/Types/ModelPermissionDeserializerRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/ModelPermissionDeserializerRequest.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Ticketing;
 
-public class ModelPermissionDeserializerRequest
+public record ModelPermissionDeserializerRequest
 {
     [JsonPropertyName("is_enabled")]
-    public bool? IsEnabled { get; init; }
+    public bool? IsEnabled { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/MultipartFormFieldRequest.cs b/src/Merge.Client/Ticketing/Types/MultipartFormFieldRequest.cs
index 8799d17e..9ca4272d 100644
--- a/src/Merge.Client/Ticketing/Types/MultipartFormFieldRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/MultipartFormFieldRequest.cs
@@ -1,23 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class MultipartFormFieldRequest
+public record MultipartFormFieldRequest
 {
     /// <summary>
     /// The name of the form field
     /// </summary>
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     /// <summary>
     /// The data for the form field.
     /// </summary>
     [JsonPropertyName("data")]
-    public string Data { get; init; }
+    public required string Data { get; set; }
 
     /// <summary>
     /// The encoding of the value of `data`. Defaults to `RAW` if not defined.
@@ -27,17 +26,17 @@ public class MultipartFormFieldRequest
     /// - `GZIP_BASE64` - GZIP_BASE64
     /// </summary>
     [JsonPropertyName("encoding")]
-    public EncodingEnum? Encoding { get; init; }
+    public EncodingEnum? Encoding { get; set; }
 
     /// <summary>
     /// The file name of the form field, if the field is for a file.
     /// </summary>
     [JsonPropertyName("file_name")]
-    public string? FileName { get; init; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// The MIME type of the file, if the field is for a file.
     /// </summary>
     [JsonPropertyName("content_type")]
-    public string? ContentType { get; init; }
+    public string? ContentType { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedAccountDetailsAndActionsList.cs b/src/Merge.Client/Ticketing/Types/PaginatedAccountDetailsAndActionsList.cs
index 5ead91b5..da0120fb 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedAccountDetailsAndActionsList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedAccountDetailsAndActionsList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedAccountDetailsAndActionsList
+public record PaginatedAccountDetailsAndActionsList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AccountDetailsAndActions>? Results { get; init; }
+    public IEnumerable<AccountDetailsAndActions>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedAccountList.cs b/src/Merge.Client/Ticketing/Types/PaginatedAccountList.cs
index 94ca81f5..58795697 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedAccountList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedAccountList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedAccountList
+public record PaginatedAccountList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Account>? Results { get; init; }
+    public IEnumerable<Account>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedAttachmentList.cs b/src/Merge.Client/Ticketing/Types/PaginatedAttachmentList.cs
index 0f119d68..a834cf04 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedAttachmentList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedAttachmentList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedAttachmentList
+public record PaginatedAttachmentList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Attachment>? Results { get; init; }
+    public IEnumerable<Attachment>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedAuditLogEventList.cs b/src/Merge.Client/Ticketing/Types/PaginatedAuditLogEventList.cs
index 193dd4b3..f3b9acfb 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedAuditLogEventList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedAuditLogEventList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedAuditLogEventList
+public record PaginatedAuditLogEventList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<AuditLogEvent>? Results { get; init; }
+    public IEnumerable<AuditLogEvent>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedCollectionList.cs b/src/Merge.Client/Ticketing/Types/PaginatedCollectionList.cs
index 4cf53b54..efd5ea17 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedCollectionList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedCollectionList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedCollectionList
+public record PaginatedCollectionList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Collection>? Results { get; init; }
+    public IEnumerable<Collection>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedCommentList.cs b/src/Merge.Client/Ticketing/Types/PaginatedCommentList.cs
index a2eed257..db85e04f 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedCommentList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedCommentList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedCommentList
+public record PaginatedCommentList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Comment>? Results { get; init; }
+    public IEnumerable<Comment>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedContactList.cs b/src/Merge.Client/Ticketing/Types/PaginatedContactList.cs
index c4df5534..58e1f995 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedContactList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedContactList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedContactList
+public record PaginatedContactList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Contact>? Results { get; init; }
+    public IEnumerable<Contact>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedIssueList.cs b/src/Merge.Client/Ticketing/Types/PaginatedIssueList.cs
index 64ee57d1..cb94812e 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedIssueList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedIssueList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedIssueList
+public record PaginatedIssueList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Issue>? Results { get; init; }
+    public IEnumerable<Issue>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedProjectList.cs b/src/Merge.Client/Ticketing/Types/PaginatedProjectList.cs
index 7d1f40bd..745b6356 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedProjectList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedProjectList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedProjectList
+public record PaginatedProjectList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Project>? Results { get; init; }
+    public IEnumerable<Project>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedRemoteFieldClassList.cs b/src/Merge.Client/Ticketing/Types/PaginatedRemoteFieldClassList.cs
index 1cfa3eac..21441283 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedRemoteFieldClassList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedRemoteFieldClassList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedRemoteFieldClassList
+public record PaginatedRemoteFieldClassList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<RemoteFieldClass>? Results { get; init; }
+    public IEnumerable<RemoteFieldClass>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedRoleList.cs b/src/Merge.Client/Ticketing/Types/PaginatedRoleList.cs
index bec82440..24f00ad9 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedRoleList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedRoleList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedRoleList
+public record PaginatedRoleList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Role>? Results { get; init; }
+    public IEnumerable<Role>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedSyncStatusList.cs b/src/Merge.Client/Ticketing/Types/PaginatedSyncStatusList.cs
index 98f6acf2..ca53db5c 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedSyncStatusList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedSyncStatusList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedSyncStatusList
+public record PaginatedSyncStatusList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<SyncStatus>? Results { get; init; }
+    public IEnumerable<SyncStatus>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedTagList.cs b/src/Merge.Client/Ticketing/Types/PaginatedTagList.cs
index 1294fa26..9d8c8cdf 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedTagList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedTagList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedTagList
+public record PaginatedTagList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Tag>? Results { get; init; }
+    public IEnumerable<Tag>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedTeamList.cs b/src/Merge.Client/Ticketing/Types/PaginatedTeamList.cs
index 4004759a..ff2d80c0 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedTeamList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedTeamList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedTeamList
+public record PaginatedTeamList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Team>? Results { get; init; }
+    public IEnumerable<Team>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedTicketList.cs b/src/Merge.Client/Ticketing/Types/PaginatedTicketList.cs
index bd7ffc2e..f46268a6 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedTicketList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedTicketList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedTicketList
+public record PaginatedTicketList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<Ticket>? Results { get; init; }
+    public IEnumerable<Ticket>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PaginatedUserList.cs b/src/Merge.Client/Ticketing/Types/PaginatedUserList.cs
index 1fe1d364..cb4e9d4b 100644
--- a/src/Merge.Client/Ticketing/Types/PaginatedUserList.cs
+++ b/src/Merge.Client/Ticketing/Types/PaginatedUserList.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PaginatedUserList
+public record PaginatedUserList
 {
     [JsonPropertyName("next")]
-    public string? Next { get; init; }
+    public string? Next { get; set; }
 
     [JsonPropertyName("previous")]
-    public string? Previous { get; init; }
+    public string? Previous { get; set; }
 
     [JsonPropertyName("results")]
-    public IEnumerable<User>? Results { get; init; }
+    public IEnumerable<User>? Results { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PatchedTicketRequest.cs b/src/Merge.Client/Ticketing/Types/PatchedTicketRequest.cs
index 22af1782..147b012e 100644
--- a/src/Merge.Client/Ticketing/Types/PatchedTicketRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/PatchedTicketRequest.cs
@@ -1,32 +1,31 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class PatchedTicketRequest
+public record PatchedTicketRequest
 {
     /// <summary>
     /// The ticket's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("assignees")]
-    public IEnumerable<string>? Assignees { get; init; }
+    public IEnumerable<string>? Assignees { get; set; }
 
     /// <summary>
     /// The user who created this ticket.
     /// </summary>
     [JsonPropertyName("creator")]
-    public string? Creator { get; init; }
+    public string? Creator { get; set; }
 
     /// <summary>
     /// The ticket's due date.
     /// </summary>
     [JsonPropertyName("due_date")]
-    public DateTime? DueDate { get; init; }
+    public DateTime? DueDate { get; set; }
 
     /// <summary>
     /// The current status of the ticket.
@@ -37,55 +36,55 @@ public class PatchedTicketRequest
     /// - `ON_HOLD` - ON_HOLD
     /// </summary>
     [JsonPropertyName("status")]
-    public TicketStatusEnum? Status { get; init; }
+    public TicketStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The ticket’s description. HTML version of description is mapped if supported by the third-party platform.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("collections")]
-    public IEnumerable<string>? Collections { get; init; }
+    public IEnumerable<string>? Collections { get; set; }
 
     /// <summary>
     /// The sub category of the ticket within the 3rd party system. Examples include incident, task, subtask or to-do.
     /// </summary>
     [JsonPropertyName("ticket_type")]
-    public string? TicketType { get; init; }
+    public string? TicketType { get; set; }
 
     /// <summary>
     /// The account associated with the ticket.
     /// </summary>
     [JsonPropertyName("account")]
-    public string? Account { get; init; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// The contact associated with the ticket.
     /// </summary>
     [JsonPropertyName("contact")]
-    public string? Contact { get; init; }
+    public string? Contact { get; set; }
 
     /// <summary>
     /// The ticket's parent ticket.
     /// </summary>
     [JsonPropertyName("parent_ticket")]
-    public string? ParentTicket { get; init; }
+    public string? ParentTicket { get; set; }
 
     [JsonPropertyName("tags")]
-    public IEnumerable<string>? Tags { get; init; }
+    public IEnumerable<string>? Tags { get; set; }
 
     /// <summary>
     /// When the ticket was completed.
     /// </summary>
     [JsonPropertyName("completed_at")]
-    public DateTime? CompletedAt { get; init; }
+    public DateTime? CompletedAt { get; set; }
 
     /// <summary>
     /// The 3rd party url of the Ticket.
     /// </summary>
     [JsonPropertyName("ticket_url")]
-    public string? TicketUrl { get; init; }
+    public string? TicketUrl { get; set; }
 
     /// <summary>
     /// The priority or urgency of the Ticket.
@@ -96,14 +95,14 @@ public class PatchedTicketRequest
     /// - `LOW` - LOW
     /// </summary>
     [JsonPropertyName("priority")]
-    public PriorityEnum? Priority { get; init; }
+    public PriorityEnum? Priority { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/PriorityEnum.cs b/src/Merge.Client/Ticketing/Types/PriorityEnum.cs
index 82d667f1..2c8ecbd5 100644
--- a/src/Merge.Client/Ticketing/Types/PriorityEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/PriorityEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/Project.cs b/src/Merge.Client/Ticketing/Types/Project.cs
index 4173194c..e318ad15 100644
--- a/src/Merge.Client/Ticketing/Types/Project.cs
+++ b/src/Merge.Client/Ticketing/Types/Project.cs
@@ -1,54 +1,53 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Project
+public record Project
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The project's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The project's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteData.cs b/src/Merge.Client/Ticketing/Types/RemoteData.cs
index 56b1cf47..64abc17b 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteData.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteData.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteData
+public record RemoteData
 {
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("data")]
-    public object? Data { get; init; }
+    public object? Data { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteEndpointInfo.cs b/src/Merge.Client/Ticketing/Types/RemoteEndpointInfo.cs
index 5010f8ef..a3593e2b 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteEndpointInfo.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteEndpointInfo.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteEndpointInfo
+public record RemoteEndpointInfo
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("url_path")]
-    public string UrlPath { get; init; }
+    public required string UrlPath { get; set; }
 
     [JsonPropertyName("field_traversal_path")]
-    public IEnumerable<object> FieldTraversalPath { get; init; }
+    public IEnumerable<object> FieldTraversalPath { get; set; } = new List<object>();
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteField.cs b/src/Merge.Client/Ticketing/Types/RemoteField.cs
index 70f132bd..fc463e5d 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteField.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteField.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteField
+public record RemoteField
 {
     [JsonPropertyName("remote_field_class")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteFieldClass>>))]
-    public OneOf<string, RemoteFieldClass> RemoteFieldClass { get; init; }
+    public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }
 
     [JsonPropertyName("value")]
-    public object? Value { get; init; }
+    public object? Value { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteFieldApi.cs b/src/Merge.Client/Ticketing/Types/RemoteFieldApi.cs
index 26361c13..577c48a1 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteFieldApi.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteFieldApi.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteFieldApi
+public record RemoteFieldApi
 {
     [JsonPropertyName("schema")]
-    public Dictionary<string, object> Schema { get; init; }
+    public Dictionary<string, object?> Schema { get; set; } = new Dictionary<string, object?>();
 
     [JsonPropertyName("remote_key_name")]
-    public string RemoteKeyName { get; init; }
+    public required string RemoteKeyName { get; set; }
 
     [JsonPropertyName("remote_endpoint_info")]
-    public RemoteEndpointInfo RemoteEndpointInfo { get; init; }
+    public required RemoteEndpointInfo RemoteEndpointInfo { get; set; }
 
     [JsonPropertyName("example_values")]
-    public IEnumerable<object>? ExampleValues { get; init; }
+    public IEnumerable<object>? ExampleValues { get; set; }
 
     [JsonPropertyName("advanced_metadata")]
-    public AdvancedMetadata? AdvancedMetadata { get; init; }
+    public AdvancedMetadata? AdvancedMetadata { get; set; }
 
     [JsonPropertyName("coverage")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<int, double>>))]
-    public OneOf<int, double>? Coverage { get; init; }
+    public OneOf<int, double>? Coverage { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteFieldApiResponse.cs b/src/Merge.Client/Ticketing/Types/RemoteFieldApiResponse.cs
index 795702f3..21842a8f 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteFieldApiResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteFieldApiResponse.cs
@@ -1,42 +1,41 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteFieldApiResponse
+public record RemoteFieldApiResponse
 {
     [JsonPropertyName("Ticket")]
-    public IEnumerable<RemoteFieldApi>? Ticket { get; init; }
+    public IEnumerable<RemoteFieldApi>? Ticket { get; set; }
 
     [JsonPropertyName("Comment")]
-    public IEnumerable<RemoteFieldApi>? Comment { get; init; }
+    public IEnumerable<RemoteFieldApi>? Comment { get; set; }
 
     [JsonPropertyName("Project")]
-    public IEnumerable<RemoteFieldApi>? Project { get; init; }
+    public IEnumerable<RemoteFieldApi>? Project { get; set; }
 
     [JsonPropertyName("Collection")]
-    public IEnumerable<RemoteFieldApi>? Collection { get; init; }
+    public IEnumerable<RemoteFieldApi>? Collection { get; set; }
 
     [JsonPropertyName("User")]
-    public IEnumerable<RemoteFieldApi>? User { get; init; }
+    public IEnumerable<RemoteFieldApi>? User { get; set; }
 
     [JsonPropertyName("Role")]
-    public IEnumerable<RemoteFieldApi>? Role { get; init; }
+    public IEnumerable<RemoteFieldApi>? Role { get; set; }
 
     [JsonPropertyName("Account")]
-    public IEnumerable<RemoteFieldApi>? Account { get; init; }
+    public IEnumerable<RemoteFieldApi>? Account { get; set; }
 
     [JsonPropertyName("Team")]
-    public IEnumerable<RemoteFieldApi>? Team { get; init; }
+    public IEnumerable<RemoteFieldApi>? Team { get; set; }
 
     [JsonPropertyName("Attachment")]
-    public IEnumerable<RemoteFieldApi>? Attachment { get; init; }
+    public IEnumerable<RemoteFieldApi>? Attachment { get; set; }
 
     [JsonPropertyName("Tag")]
-    public IEnumerable<RemoteFieldApi>? Tag { get; init; }
+    public IEnumerable<RemoteFieldApi>? Tag { get; set; }
 
     [JsonPropertyName("Contact")]
-    public IEnumerable<RemoteFieldApi>? Contact { get; init; }
+    public IEnumerable<RemoteFieldApi>? Contact { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteFieldClass.cs b/src/Merge.Client/Ticketing/Types/RemoteFieldClass.cs
index 77719001..fbfb7843 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteFieldClass.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteFieldClass.cs
@@ -1,39 +1,38 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteFieldClass
+public record RemoteFieldClass
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 
     [JsonPropertyName("remote_key_name")]
-    public string? RemoteKeyName { get; init; }
+    public string? RemoteKeyName { get; set; }
 
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("is_custom")]
-    public bool? IsCustom { get; init; }
+    public bool? IsCustom { get; set; }
 
     [JsonPropertyName("is_required")]
-    public bool? IsRequired { get; init; }
+    public bool? IsRequired { get; set; }
 
     [JsonPropertyName("field_type")]
-    public FieldTypeEnum? FieldType { get; init; }
+    public FieldTypeEnum? FieldType { get; set; }
 
     [JsonPropertyName("field_format")]
-    public FieldFormatEnum? FieldFormat { get; init; }
+    public FieldFormatEnum? FieldFormat { get; set; }
 
     [JsonPropertyName("field_choices")]
-    public IEnumerable<RemoteFieldClassFieldChoicesItem>? FieldChoices { get; init; }
+    public IEnumerable<RemoteFieldClassFieldChoicesItem>? FieldChoices { get; set; }
 
     [JsonPropertyName("item_schema")]
-    public ItemSchema? ItemSchema { get; init; }
+    public ItemSchema? ItemSchema { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteFieldClassFieldChoicesItem.cs b/src/Merge.Client/Ticketing/Types/RemoteFieldClassFieldChoicesItem.cs
index 3a7b9893..a453e07a 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteFieldClassFieldChoicesItem.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteFieldClassFieldChoicesItem.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteFieldClassFieldChoicesItem
+public record RemoteFieldClassFieldChoicesItem
 {
     [JsonPropertyName("value")]
-    public object? Value { get; init; }
+    public object? Value { get; set; }
 
     [JsonPropertyName("display_name")]
-    public string? DisplayName { get; init; }
+    public string? DisplayName { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteFieldRequest.cs b/src/Merge.Client/Ticketing/Types/RemoteFieldRequest.cs
index cc422338..d21c5bff 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteFieldRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteFieldRequest.cs
@@ -1,18 +1,17 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteFieldRequest
+public record RemoteFieldRequest
 {
     [JsonPropertyName("remote_field_class")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, RemoteFieldClass>>))]
-    public OneOf<string, RemoteFieldClass> RemoteFieldClass { get; init; }
+    public required OneOf<string, RemoteFieldClass> RemoteFieldClass { get; set; }
 
     [JsonPropertyName("value")]
-    public string? Value { get; init; }
+    public string? Value { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteKey.cs b/src/Merge.Client/Ticketing/Types/RemoteKey.cs
index c807a5cd..33b5cc92 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteKey.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteKey.cs
@@ -4,11 +4,11 @@
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteKey
+public record RemoteKey
 {
     [JsonPropertyName("name")]
-    public string Name { get; init; }
+    public required string Name { get; set; }
 
     [JsonPropertyName("key")]
-    public string Key { get; init; }
+    public required string Key { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RemoteResponse.cs b/src/Merge.Client/Ticketing/Types/RemoteResponse.cs
index e6ee49f0..18891c6f 100644
--- a/src/Merge.Client/Ticketing/Types/RemoteResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/RemoteResponse.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class RemoteResponse
+public record RemoteResponse
 {
     [JsonPropertyName("method")]
-    public string Method { get; init; }
+    public required string Method { get; set; }
 
     [JsonPropertyName("path")]
-    public string Path { get; init; }
+    public required string Path { get; set; }
 
     [JsonPropertyName("status")]
-    public int Status { get; init; }
+    public required int Status { get; set; }
 
     [JsonPropertyName("response")]
-    public object Response { get; init; }
+    public required object Response { get; set; }
 
     [JsonPropertyName("response_headers")]
-    public Dictionary<string, object>? ResponseHeaders { get; init; }
+    public Dictionary<string, object?>? ResponseHeaders { get; set; }
 
     [JsonPropertyName("response_type")]
-    public ResponseTypeEnum? ResponseType { get; init; }
+    public ResponseTypeEnum? ResponseType { get; set; }
 
     [JsonPropertyName("headers")]
-    public Dictionary<string, object>? Headers { get; init; }
+    public Dictionary<string, object?>? Headers { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RequestFormatEnum.cs b/src/Merge.Client/Ticketing/Types/RequestFormatEnum.cs
index 5c89d763..72877ee5 100644
--- a/src/Merge.Client/Ticketing/Types/RequestFormatEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/RequestFormatEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/ResponseTypeEnum.cs b/src/Merge.Client/Ticketing/Types/ResponseTypeEnum.cs
index 2a21e08f..dd21bd5b 100644
--- a/src/Merge.Client/Ticketing/Types/ResponseTypeEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/ResponseTypeEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/Role.cs b/src/Merge.Client/Ticketing/Types/Role.cs
index 416ee631..90942f38 100644
--- a/src/Merge.Client/Ticketing/Types/Role.cs
+++ b/src/Merge.Client/Ticketing/Types/Role.cs
@@ -1,44 +1,43 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Role
+public record Role
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The name of the Role.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The set of actions that a User with this Role can perform. Possible enum values include: `VIEW`, `CREATE`, `EDIT`, `DELETE`, `CLOSE`, and `ASSIGN`.
     /// </summary>
     [JsonPropertyName("ticket_actions")]
-    public IEnumerable<TicketActionsEnum>? TicketActions { get; init; }
+    public IEnumerable<TicketActionsEnum>? TicketActions { get; set; }
 
     /// <summary>
     /// The level of Ticket access that a User with this Role can perform.
@@ -48,17 +47,17 @@ public class Role
     /// - `TEAM_ONLY` - TEAM_ONLY
     /// </summary>
     [JsonPropertyName("ticket_access")]
-    public TicketAccessEnum? TicketAccess { get; init; }
+    public TicketAccessEnum? TicketAccess { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/RoleEnum.cs b/src/Merge.Client/Ticketing/Types/RoleEnum.cs
index e9bcb9ea..54600242 100644
--- a/src/Merge.Client/Ticketing/Types/RoleEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/RoleEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/SelectiveSyncConfigurationsUsageEnum.cs b/src/Merge.Client/Ticketing/Types/SelectiveSyncConfigurationsUsageEnum.cs
index 06f0b04f..e94d7b7e 100644
--- a/src/Merge.Client/Ticketing/Types/SelectiveSyncConfigurationsUsageEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/SelectiveSyncConfigurationsUsageEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/SyncStatus.cs b/src/Merge.Client/Ticketing/Types/SyncStatus.cs
index 0a3d61f9..b3abd8a9 100644
--- a/src/Merge.Client/Ticketing/Types/SyncStatus.cs
+++ b/src/Merge.Client/Ticketing/Types/SyncStatus.cs
@@ -1,30 +1,29 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class SyncStatus
+public record SyncStatus
 {
     [JsonPropertyName("model_name")]
-    public string ModelName { get; init; }
+    public required string ModelName { get; set; }
 
     [JsonPropertyName("model_id")]
-    public string ModelId { get; init; }
+    public required string ModelId { get; set; }
 
     [JsonPropertyName("last_sync_start")]
-    public DateTime? LastSyncStart { get; init; }
+    public DateTime? LastSyncStart { get; set; }
 
     [JsonPropertyName("next_sync_start")]
-    public DateTime? NextSyncStart { get; init; }
+    public DateTime? NextSyncStart { get; set; }
 
     [JsonPropertyName("status")]
-    public SyncStatusStatusEnum Status { get; init; }
+    public required SyncStatusStatusEnum Status { get; set; }
 
     [JsonPropertyName("is_initial_sync")]
-    public bool IsInitialSync { get; init; }
+    public required bool IsInitialSync { get; set; }
 
     [JsonPropertyName("selective_sync_configurations_usage")]
-    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; init; }
+    public SelectiveSyncConfigurationsUsageEnum? SelectiveSyncConfigurationsUsage { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/SyncStatusStatusEnum.cs b/src/Merge.Client/Ticketing/Types/SyncStatusStatusEnum.cs
index 046b663b..312a0fbb 100644
--- a/src/Merge.Client/Ticketing/Types/SyncStatusStatusEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/SyncStatusStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/Tag.cs b/src/Merge.Client/Ticketing/Types/Tag.cs
index 310a0703..dbb02b3e 100644
--- a/src/Merge.Client/Ticketing/Types/Tag.cs
+++ b/src/Merge.Client/Ticketing/Types/Tag.cs
@@ -1,48 +1,47 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Tag
+public record Tag
 {
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The tag's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/Team.cs b/src/Merge.Client/Ticketing/Types/Team.cs
index 3d279e4c..97e6898b 100644
--- a/src/Merge.Client/Ticketing/Types/Team.cs
+++ b/src/Merge.Client/Ticketing/Types/Team.cs
@@ -1,54 +1,53 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Team
+public record Team
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The team's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The team's description.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/Ticket.cs b/src/Merge.Client/Ticketing/Types/Ticket.cs
index c1c34147..ae2867a2 100644
--- a/src/Merge.Client/Ticketing/Types/Ticket.cs
+++ b/src/Merge.Client/Ticketing/Types/Ticket.cs
@@ -1,59 +1,58 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class Ticket
+public record Ticket
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The ticket's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("assignees")]
     [JsonConverter(
         typeof(CollectionItemSerializer<OneOf<string, User>, OneOfSerializer<OneOf<string, User>>>)
     )]
-    public IEnumerable<OneOf<string, User>>? Assignees { get; init; }
+    public IEnumerable<OneOf<string, User>>? Assignees { get; set; }
 
     /// <summary>
     /// The user who created this ticket.
     /// </summary>
     [JsonPropertyName("creator")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Creator { get; init; }
+    public OneOf<string, User>? Creator { get; set; }
 
     /// <summary>
     /// The ticket's due date.
     /// </summary>
     [JsonPropertyName("due_date")]
-    public DateTime? DueDate { get; init; }
+    public DateTime? DueDate { get; set; }
 
     /// <summary>
     /// The current status of the ticket.
@@ -64,13 +63,13 @@ public class Ticket
     /// - `ON_HOLD` - ON_HOLD
     /// </summary>
     [JsonPropertyName("status")]
-    public TicketStatusEnum? Status { get; init; }
+    public TicketStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The ticket’s description. HTML version of description is mapped if supported by the third-party platform.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("collections")]
     [JsonConverter(
@@ -79,34 +78,34 @@ public class Ticket
             OneOfSerializer<OneOf<string, Collection>>
         >)
     )]
-    public IEnumerable<OneOf<string, Collection>>? Collections { get; init; }
+    public IEnumerable<OneOf<string, Collection>>? Collections { get; set; }
 
     /// <summary>
     /// The sub category of the ticket within the 3rd party system. Examples include incident, task, subtask or to-do.
     /// </summary>
     [JsonPropertyName("ticket_type")]
-    public string? TicketType { get; init; }
+    public string? TicketType { get; set; }
 
     /// <summary>
     /// The account associated with the ticket.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The contact associated with the ticket.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The ticket's parent ticket.
     /// </summary>
     [JsonPropertyName("parent_ticket")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Ticket>>))]
-    public OneOf<string, Ticket>? ParentTicket { get; init; }
+    public OneOf<string, Ticket>? ParentTicket { get; set; }
 
     [JsonPropertyName("attachments")]
     [JsonConverter(
@@ -115,37 +114,37 @@ public class Ticket
             OneOfSerializer<OneOf<string, Attachment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Attachment>>? Attachments { get; init; }
+    public IEnumerable<OneOf<string, Attachment>>? Attachments { get; set; }
 
     [JsonPropertyName("tags")]
-    public IEnumerable<string>? Tags { get; init; }
+    public IEnumerable<string>? Tags { get; set; }
 
     /// <summary>
     /// When the third party's ticket was created.
     /// </summary>
     [JsonPropertyName("remote_created_at")]
-    public DateTime? RemoteCreatedAt { get; init; }
+    public DateTime? RemoteCreatedAt { get; set; }
 
     /// <summary>
     /// When the third party's ticket was updated.
     /// </summary>
     [JsonPropertyName("remote_updated_at")]
-    public DateTime? RemoteUpdatedAt { get; init; }
+    public DateTime? RemoteUpdatedAt { get; set; }
 
     /// <summary>
     /// When the ticket was completed.
     /// </summary>
     [JsonPropertyName("completed_at")]
-    public DateTime? CompletedAt { get; init; }
+    public DateTime? CompletedAt { get; set; }
 
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     /// <summary>
     /// The 3rd party url of the Ticket.
     /// </summary>
     [JsonPropertyName("ticket_url")]
-    public string? TicketUrl { get; init; }
+    public string? TicketUrl { get; set; }
 
     /// <summary>
     /// The priority or urgency of the Ticket.
@@ -156,14 +155,14 @@ public class Ticket
     /// - `LOW` - LOW
     /// </summary>
     [JsonPropertyName("priority")]
-    public PriorityEnum? Priority { get; init; }
+    public PriorityEnum? Priority { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteField>? RemoteFields { get; init; }
+    public IEnumerable<RemoteField>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/TicketAccessEnum.cs b/src/Merge.Client/Ticketing/Types/TicketAccessEnum.cs
index ec3d4eed..f9994d26 100644
--- a/src/Merge.Client/Ticketing/Types/TicketAccessEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/TicketAccessEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/TicketActionsEnum.cs b/src/Merge.Client/Ticketing/Types/TicketActionsEnum.cs
index b0529a34..1feddedf 100644
--- a/src/Merge.Client/Ticketing/Types/TicketActionsEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/TicketActionsEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/TicketRequest.cs b/src/Merge.Client/Ticketing/Types/TicketRequest.cs
index 94dedd7b..32354262 100644
--- a/src/Merge.Client/Ticketing/Types/TicketRequest.cs
+++ b/src/Merge.Client/Ticketing/Types/TicketRequest.cs
@@ -1,38 +1,37 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class TicketRequest
+public record TicketRequest
 {
     /// <summary>
     /// The ticket's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     [JsonPropertyName("assignees")]
     [JsonConverter(
         typeof(CollectionItemSerializer<OneOf<string, User>, OneOfSerializer<OneOf<string, User>>>)
     )]
-    public IEnumerable<OneOf<string, User>>? Assignees { get; init; }
+    public IEnumerable<OneOf<string, User>>? Assignees { get; set; }
 
     /// <summary>
     /// The user who created this ticket.
     /// </summary>
     [JsonPropertyName("creator")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, User>>))]
-    public OneOf<string, User>? Creator { get; init; }
+    public OneOf<string, User>? Creator { get; set; }
 
     /// <summary>
     /// The ticket's due date.
     /// </summary>
     [JsonPropertyName("due_date")]
-    public DateTime? DueDate { get; init; }
+    public DateTime? DueDate { get; set; }
 
     /// <summary>
     /// The current status of the ticket.
@@ -43,13 +42,13 @@ public class TicketRequest
     /// - `ON_HOLD` - ON_HOLD
     /// </summary>
     [JsonPropertyName("status")]
-    public TicketStatusEnum? Status { get; init; }
+    public TicketStatusEnum? Status { get; set; }
 
     /// <summary>
     /// The ticket’s description. HTML version of description is mapped if supported by the third-party platform.
     /// </summary>
     [JsonPropertyName("description")]
-    public string? Description { get; init; }
+    public string? Description { get; set; }
 
     [JsonPropertyName("collections")]
     [JsonConverter(
@@ -58,34 +57,34 @@ public class TicketRequest
             OneOfSerializer<OneOf<string, Collection>>
         >)
     )]
-    public IEnumerable<OneOf<string, Collection>>? Collections { get; init; }
+    public IEnumerable<OneOf<string, Collection>>? Collections { get; set; }
 
     /// <summary>
     /// The sub category of the ticket within the 3rd party system. Examples include incident, task, subtask or to-do.
     /// </summary>
     [JsonPropertyName("ticket_type")]
-    public string? TicketType { get; init; }
+    public string? TicketType { get; set; }
 
     /// <summary>
     /// The account associated with the ticket.
     /// </summary>
     [JsonPropertyName("account")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Account>>))]
-    public OneOf<string, Account>? Account { get; init; }
+    public OneOf<string, Account>? Account { get; set; }
 
     /// <summary>
     /// The contact associated with the ticket.
     /// </summary>
     [JsonPropertyName("contact")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Contact>>))]
-    public OneOf<string, Contact>? Contact { get; init; }
+    public OneOf<string, Contact>? Contact { get; set; }
 
     /// <summary>
     /// The ticket's parent ticket.
     /// </summary>
     [JsonPropertyName("parent_ticket")]
     [JsonConverter(typeof(OneOfSerializer<OneOf<string, Ticket>>))]
-    public OneOf<string, Ticket>? ParentTicket { get; init; }
+    public OneOf<string, Ticket>? ParentTicket { get; set; }
 
     [JsonPropertyName("attachments")]
     [JsonConverter(
@@ -94,22 +93,22 @@ public class TicketRequest
             OneOfSerializer<OneOf<string, Attachment>>
         >)
     )]
-    public IEnumerable<OneOf<string, Attachment>>? Attachments { get; init; }
+    public IEnumerable<OneOf<string, Attachment>>? Attachments { get; set; }
 
     [JsonPropertyName("tags")]
-    public IEnumerable<string>? Tags { get; init; }
+    public IEnumerable<string>? Tags { get; set; }
 
     /// <summary>
     /// When the ticket was completed.
     /// </summary>
     [JsonPropertyName("completed_at")]
-    public DateTime? CompletedAt { get; init; }
+    public DateTime? CompletedAt { get; set; }
 
     /// <summary>
     /// The 3rd party url of the Ticket.
     /// </summary>
     [JsonPropertyName("ticket_url")]
-    public string? TicketUrl { get; init; }
+    public string? TicketUrl { get; set; }
 
     /// <summary>
     /// The priority or urgency of the Ticket.
@@ -120,14 +119,14 @@ public class TicketRequest
     /// - `LOW` - LOW
     /// </summary>
     [JsonPropertyName("priority")]
-    public PriorityEnum? Priority { get; init; }
+    public PriorityEnum? Priority { get; set; }
 
     [JsonPropertyName("integration_params")]
-    public Dictionary<string, object>? IntegrationParams { get; init; }
+    public Dictionary<string, object?>? IntegrationParams { get; set; }
 
     [JsonPropertyName("linked_account_params")]
-    public Dictionary<string, object>? LinkedAccountParams { get; init; }
+    public Dictionary<string, object?>? LinkedAccountParams { get; set; }
 
     [JsonPropertyName("remote_fields")]
-    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; init; }
+    public IEnumerable<RemoteFieldRequest>? RemoteFields { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/TicketResponse.cs b/src/Merge.Client/Ticketing/Types/TicketResponse.cs
index fe15f8be..e675db90 100644
--- a/src/Merge.Client/Ticketing/Types/TicketResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/TicketResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class TicketResponse
+public record TicketResponse
 {
     [JsonPropertyName("model")]
-    public Ticket Model { get; init; }
+    public required Ticket Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/TicketStatusEnum.cs b/src/Merge.Client/Ticketing/Types/TicketStatusEnum.cs
index f503c104..50638b4c 100644
--- a/src/Merge.Client/Ticketing/Types/TicketStatusEnum.cs
+++ b/src/Merge.Client/Ticketing/Types/TicketStatusEnum.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Types/TicketingAttachmentResponse.cs b/src/Merge.Client/Ticketing/Types/TicketingAttachmentResponse.cs
index 9c9b31b6..c3bf0e4e 100644
--- a/src/Merge.Client/Ticketing/Types/TicketingAttachmentResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/TicketingAttachmentResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class TicketingAttachmentResponse
+public record TicketingAttachmentResponse
 {
     [JsonPropertyName("model")]
-    public Attachment Model { get; init; }
+    public required Attachment Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/TicketingContactResponse.cs b/src/Merge.Client/Ticketing/Types/TicketingContactResponse.cs
index 73f2d704..876367a3 100644
--- a/src/Merge.Client/Ticketing/Types/TicketingContactResponse.cs
+++ b/src/Merge.Client/Ticketing/Types/TicketingContactResponse.cs
@@ -1,21 +1,22 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class TicketingContactResponse
+public record TicketingContactResponse
 {
     [JsonPropertyName("model")]
-    public Contact Model { get; init; }
+    public required Contact Model { get; set; }
 
     [JsonPropertyName("warnings")]
-    public IEnumerable<WarningValidationProblem> Warnings { get; init; }
+    public IEnumerable<WarningValidationProblem> Warnings { get; set; } =
+        new List<WarningValidationProblem>();
 
     [JsonPropertyName("errors")]
-    public IEnumerable<ErrorValidationProblem> Errors { get; init; }
+    public IEnumerable<ErrorValidationProblem> Errors { get; set; } =
+        new List<ErrorValidationProblem>();
 
     [JsonPropertyName("logs")]
-    public IEnumerable<DebugModeLog>? Logs { get; init; }
+    public IEnumerable<DebugModeLog>? Logs { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/User.cs b/src/Merge.Client/Ticketing/Types/User.cs
index eb6b7cba..5c78f1ae 100644
--- a/src/Merge.Client/Ticketing/Types/User.cs
+++ b/src/Merge.Client/Ticketing/Types/User.cs
@@ -1,80 +1,79 @@
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 using OneOf;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class User
+public record User
 {
     [JsonPropertyName("id")]
-    public string? Id { get; init; }
+    public string? Id { get; set; }
 
     /// <summary>
     /// The third-party API ID of the matching object.
     /// </summary>
     [JsonPropertyName("remote_id")]
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 
     /// <summary>
     /// The datetime that this object was created by Merge.
     /// </summary>
     [JsonPropertyName("created_at")]
-    public DateTime? CreatedAt { get; init; }
+    public DateTime? CreatedAt { get; set; }
 
     /// <summary>
     /// The datetime that this object was modified by Merge.
     /// </summary>
     [JsonPropertyName("modified_at")]
-    public DateTime? ModifiedAt { get; init; }
+    public DateTime? ModifiedAt { get; set; }
 
     /// <summary>
     /// The user's name.
     /// </summary>
     [JsonPropertyName("name")]
-    public string? Name { get; init; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// The user's email address.
     /// </summary>
     [JsonPropertyName("email_address")]
-    public string? EmailAddress { get; init; }
+    public string? EmailAddress { get; set; }
 
     /// <summary>
     /// Whether or not the user is active.
     /// </summary>
     [JsonPropertyName("is_active")]
-    public bool? IsActive { get; init; }
+    public bool? IsActive { get; set; }
 
     [JsonPropertyName("teams")]
     [JsonConverter(
         typeof(CollectionItemSerializer<OneOf<string, Team>, OneOfSerializer<OneOf<string, Team>>>)
     )]
-    public IEnumerable<OneOf<string, Team>>? Teams { get; init; }
+    public IEnumerable<OneOf<string, Team>>? Teams { get; set; }
 
     [JsonPropertyName("roles")]
     [JsonConverter(
         typeof(CollectionItemSerializer<OneOf<string, Role>, OneOfSerializer<OneOf<string, Role>>>)
     )]
-    public IEnumerable<OneOf<string, Role>>? Roles { get; init; }
+    public IEnumerable<OneOf<string, Role>>? Roles { get; set; }
 
     /// <summary>
     /// The user's avatar picture.
     /// </summary>
     [JsonPropertyName("avatar")]
-    public string? Avatar { get; init; }
+    public string? Avatar { get; set; }
 
     /// <summary>
     /// Indicates whether or not this object has been deleted in the third party platform.
     /// </summary>
     [JsonPropertyName("remote_was_deleted")]
-    public bool? RemoteWasDeleted { get; init; }
+    public bool? RemoteWasDeleted { get; set; }
 
     [JsonPropertyName("field_mappings")]
-    public Dictionary<string, object>? FieldMappings { get; init; }
+    public Dictionary<string, object?>? FieldMappings { get; set; }
 
     [JsonPropertyName("remote_data")]
-    public IEnumerable<RemoteData>? RemoteData { get; init; }
+    public IEnumerable<RemoteData>? RemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/ValidationProblemSource.cs b/src/Merge.Client/Ticketing/Types/ValidationProblemSource.cs
index ee47bda6..82273ccc 100644
--- a/src/Merge.Client/Ticketing/Types/ValidationProblemSource.cs
+++ b/src/Merge.Client/Ticketing/Types/ValidationProblemSource.cs
@@ -4,8 +4,8 @@
 
 namespace Merge.Client.Ticketing;
 
-public class ValidationProblemSource
+public record ValidationProblemSource
 {
     [JsonPropertyName("pointer")]
-    public string Pointer { get; init; }
+    public required string Pointer { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/WarningValidationProblem.cs b/src/Merge.Client/Ticketing/Types/WarningValidationProblem.cs
index 31e09dcb..adf79b5d 100644
--- a/src/Merge.Client/Ticketing/Types/WarningValidationProblem.cs
+++ b/src/Merge.Client/Ticketing/Types/WarningValidationProblem.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
 namespace Merge.Client.Ticketing;
 
-public class WarningValidationProblem
+public record WarningValidationProblem
 {
     [JsonPropertyName("source")]
-    public ValidationProblemSource? Source { get; init; }
+    public ValidationProblemSource? Source { get; set; }
 
     [JsonPropertyName("title")]
-    public string Title { get; init; }
+    public required string Title { get; set; }
 
     [JsonPropertyName("detail")]
-    public string Detail { get; init; }
+    public required string Detail { get; set; }
 
     [JsonPropertyName("problem_type")]
-    public string ProblemType { get; init; }
+    public required string ProblemType { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Types/WebhookReceiver.cs b/src/Merge.Client/Ticketing/Types/WebhookReceiver.cs
index 06b35d48..2e4364a3 100644
--- a/src/Merge.Client/Ticketing/Types/WebhookReceiver.cs
+++ b/src/Merge.Client/Ticketing/Types/WebhookReceiver.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ticketing;
 
-public class WebhookReceiver
+public record WebhookReceiver
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Users/Requests/UsersListRequest.cs b/src/Merge.Client/Ticketing/Users/Requests/UsersListRequest.cs
index 3d2e7a28..50b22560 100644
--- a/src/Merge.Client/Ticketing/Users/Requests/UsersListRequest.cs
+++ b/src/Merge.Client/Ticketing/Users/Requests/UsersListRequest.cs
@@ -1,63 +1,59 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class UsersListRequest
+public record UsersListRequest
 {
     /// <summary>
     /// If provided, will only return objects created after this datetime.
     /// </summary>
-    public DateTime? CreatedAfter { get; init; }
+    public DateTime? CreatedAfter { get; set; }
 
     /// <summary>
     /// If provided, will only return objects created before this datetime.
     /// </summary>
-    public DateTime? CreatedBefore { get; init; }
+    public DateTime? CreatedBefore { get; set; }
 
     /// <summary>
     /// The pagination cursor value.
     /// </summary>
-    public string? Cursor { get; init; }
+    public string? Cursor { get; set; }
 
     /// <summary>
     /// If provided, will only return users with emails equal to this value (case insensitive).
     /// </summary>
-    public string? EmailAddress { get; init; }
+    public string? EmailAddress { get; set; }
 
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public UsersListRequestExpand? Expand { get; init; }
+    public UsersListRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include data that was marked as deleted by third party webhooks.
     /// </summary>
-    public bool? IncludeDeletedData { get; init; }
+    public bool? IncludeDeletedData { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge after this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedAfter { get; init; }
+    public DateTime? ModifiedAfter { get; set; }
 
     /// <summary>
     /// If provided, only objects synced by Merge before this date time will be returned.
     /// </summary>
-    public DateTime? ModifiedBefore { get; init; }
+    public DateTime? ModifiedBefore { get; set; }
 
     /// <summary>
     /// Number of results to return per page.
     /// </summary>
-    public int? PageSize { get; init; }
+    public int? PageSize { get; set; }
 
     /// <summary>
     /// The API provider's ID for the given object.
     /// </summary>
-    public string? RemoteId { get; init; }
+    public string? RemoteId { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Users/Requests/UsersRetrieveRequest.cs b/src/Merge.Client/Ticketing/Users/Requests/UsersRetrieveRequest.cs
index 18bd31f4..bdd5445f 100644
--- a/src/Merge.Client/Ticketing/Users/Requests/UsersRetrieveRequest.cs
+++ b/src/Merge.Client/Ticketing/Users/Requests/UsersRetrieveRequest.cs
@@ -1,18 +1,14 @@
-using Merge.Client.Ticketing;
-
-#nullable enable
-
 namespace Merge.Client.Ticketing;
 
-public class UsersRetrieveRequest
+public record UsersRetrieveRequest
 {
     /// <summary>
     /// Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     /// </summary>
-    public UsersRetrieveRequestExpand? Expand { get; init; }
+    public UsersRetrieveRequestExpand? Expand { get; set; }
 
     /// <summary>
     /// Whether to include the original data Merge fetched from the third-party to produce these models.
     /// </summary>
-    public bool? IncludeRemoteData { get; init; }
+    public bool? IncludeRemoteData { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/Users/Types/UsersListRequestExpand.cs b/src/Merge.Client/Ticketing/Users/Types/UsersListRequestExpand.cs
index 3ef633db..1a15b697 100644
--- a/src/Merge.Client/Ticketing/Users/Types/UsersListRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Users/Types/UsersListRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Users/Types/UsersRetrieveRequestExpand.cs b/src/Merge.Client/Ticketing/Users/Types/UsersRetrieveRequestExpand.cs
index ddafcf4c..927e3905 100644
--- a/src/Merge.Client/Ticketing/Users/Types/UsersRetrieveRequestExpand.cs
+++ b/src/Merge.Client/Ticketing/Users/Types/UsersRetrieveRequestExpand.cs
@@ -1,7 +1,6 @@
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Merge.Client.Core;
-using Merge.Client.Ticketing;
 
 #nullable enable
 
diff --git a/src/Merge.Client/Ticketing/Users/UsersClient.cs b/src/Merge.Client/Ticketing/Users/UsersClient.cs
index 883f5721..383134fe 100644
--- a/src/Merge.Client/Ticketing/Users/UsersClient.cs
+++ b/src/Merge.Client/Ticketing/Users/UsersClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,16 +18,21 @@ public UsersClient(RawClient client)
     /// <summary>
     /// Returns a list of `User` objects.
     /// </summary>
-    public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
+    public async Task<PaginatedUserList> ListAsync(
+        UsersListRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.CreatedAfter != null)
         {
-            _query["created_after"] = request.CreatedAfter.Value.ToString("o0");
+            _query["created_after"] = request.CreatedAfter.Value.ToString(Constants.DateTimeFormat);
         }
         if (request.CreatedBefore != null)
         {
-            _query["created_before"] = request.CreatedBefore.Value.ToString("o0");
+            _query["created_before"] = request.CreatedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.Cursor != null)
         {
@@ -51,11 +56,15 @@ public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
         }
         if (request.ModifiedAfter != null)
         {
-            _query["modified_after"] = request.ModifiedAfter.Value.ToString("o0");
+            _query["modified_after"] = request.ModifiedAfter.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.ModifiedBefore != null)
         {
-            _query["modified_before"] = request.ModifiedBefore.Value.ToString("o0");
+            _query["modified_before"] = request.ModifiedBefore.Value.ToString(
+                Constants.DateTimeFormat
+            );
         }
         if (request.PageSize != null)
         {
@@ -68,23 +77,41 @@ public async Task<PaginatedUserList> ListAsync(UsersListRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = "ticketing/v1/users",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<PaginatedUserList>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<PaginatedUserList>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Returns a `User` object with the given `id`.
     /// </summary>
-    public async Task<User> RetrieveAsync(string id, UsersRetrieveRequest request)
+    public async Task<User> RetrieveAsync(
+        string id,
+        UsersRetrieveRequest request,
+        RequestOptions? options = null
+    )
     {
         var _query = new Dictionary<string, object>() { };
         if (request.Expand != null)
@@ -98,16 +125,30 @@ public async Task<User> RetrieveAsync(string id, UsersRetrieveRequest request)
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
                 Path = $"ticketing/v1/users/{id}",
-                Query = _query
+                Query = _query,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<User>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<User>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }
diff --git a/src/Merge.Client/Ticketing/WebhookReceivers/Requests/WebhookReceiverRequest.cs b/src/Merge.Client/Ticketing/WebhookReceivers/Requests/WebhookReceiverRequest.cs
index 4adb9fbc..5abd2315 100644
--- a/src/Merge.Client/Ticketing/WebhookReceivers/Requests/WebhookReceiverRequest.cs
+++ b/src/Merge.Client/Ticketing/WebhookReceivers/Requests/WebhookReceiverRequest.cs
@@ -4,14 +4,14 @@
 
 namespace Merge.Client.Ticketing;
 
-public class WebhookReceiverRequest
+public record WebhookReceiverRequest
 {
     [JsonPropertyName("event")]
-    public string Event { get; init; }
+    public required string Event { get; set; }
 
     [JsonPropertyName("is_active")]
-    public bool IsActive { get; init; }
+    public required bool IsActive { get; set; }
 
     [JsonPropertyName("key")]
-    public string? Key { get; init; }
+    public string? Key { get; set; }
 }
diff --git a/src/Merge.Client/Ticketing/WebhookReceivers/WebhookReceiversClient.cs b/src/Merge.Client/Ticketing/WebhookReceivers/WebhookReceiversClient.cs
index ff6142ac..a166fee4 100644
--- a/src/Merge.Client/Ticketing/WebhookReceivers/WebhookReceiversClient.cs
+++ b/src/Merge.Client/Ticketing/WebhookReceivers/WebhookReceiversClient.cs
@@ -1,6 +1,6 @@
+using System.Net.Http;
 using System.Text.Json;
-using Merge.Client;
-using Merge.Client.Ticketing;
+using Merge.Client.Core;
 
 #nullable enable
 
@@ -18,41 +18,72 @@ public WebhookReceiversClient(RawClient client)
     /// <summary>
     /// Returns a list of `WebhookReceiver` objects.
     /// </summary>
-    public async Task<IEnumerable<WebhookReceiver>> ListAsync()
+    public async Task<IEnumerable<WebhookReceiver>> ListAsync(RequestOptions? options = null)
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Get,
-                Path = "ticketing/v1/webhook-receivers"
+                Path = "ticketing/v1/webhook-receivers",
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<IEnumerable<WebhookReceiver>>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<IEnumerable<WebhookReceiver>>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 
     /// <summary>
     /// Creates a `WebhookReceiver` object with the given values.
     /// </summary>
-    public async Task<WebhookReceiver> CreateAsync(WebhookReceiverRequest request)
+    public async Task<WebhookReceiver> CreateAsync(
+        WebhookReceiverRequest request,
+        RequestOptions? options = null
+    )
     {
         var response = await _client.MakeRequestAsync(
             new RawClient.JsonApiRequest
             {
+                BaseUrl = _client.Options.BaseUrl,
                 Method = HttpMethod.Post,
                 Path = "ticketing/v1/webhook-receivers",
-                Body = request
+                Body = request,
+                Options = options
             }
         );
-        string responseBody = await response.Raw.Content.ReadAsStringAsync();
-        if (response.StatusCode >= 200 && response.StatusCode < 400)
+        var responseBody = await response.Raw.Content.ReadAsStringAsync();
+        if (response.StatusCode is >= 200 and < 400)
         {
-            return JsonSerializer.Deserialize<WebhookReceiver>(responseBody);
+            try
+            {
+                return JsonUtils.Deserialize<WebhookReceiver>(responseBody)!;
+            }
+            catch (JsonException e)
+            {
+                throw new MergeException("Failed to deserialize response", e);
+            }
         }
-        throw new Exception(responseBody);
+
+        throw new MergeApiException(
+            $"Error with status code {response.StatusCode}",
+            response.StatusCode,
+            JsonUtils.Deserialize<object>(responseBody)
+        );
     }
 }