diff --git a/src/Nexus.Crypto.SDK/INexusAPIService.cs b/src/Nexus.Crypto.SDK/INexusAPIService.cs
index deb7c21..3a5e165 100644
--- a/src/Nexus.Crypto.SDK/INexusAPIService.cs
+++ b/src/Nexus.Crypto.SDK/INexusAPIService.cs
@@ -9,9 +9,7 @@ namespace Nexus.Crypto.SDK;
 
 public interface INexusAPIService
 {
-    IDocumentStoreSettingsService  DocumentStoreSettings { get; }
-    IDocumentStoreTypeService  DocumentStoreType { get; }
-    IDocumentStoreRecordService  DocumentStoreRecord { get; }
+    IDocumentStoreService DocumentStore { get; }
     ICustomerService Customer { get; }
     Task<CustomResultHolder<GetLabelPartner>> GetLabelPartner();
     Task<CustomResultHolder<GetCurrencies>> GetCurrencies();
diff --git a/src/Nexus.Crypto.SDK/Models/DocumentStoreRecord.cs b/src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreRecord.cs
similarity index 98%
rename from src/Nexus.Crypto.SDK/Models/DocumentStoreRecord.cs
rename to src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreRecord.cs
index ac7ac27..ea19a8c 100644
--- a/src/Nexus.Crypto.SDK/Models/DocumentStoreRecord.cs
+++ b/src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreRecord.cs
@@ -1,8 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.IO;
 using System.Text.Json.Serialization;
 
-namespace Nexus.Crypto.SDK.Models;
+namespace Nexus.Crypto.SDK.Models.DocumentStore;
 
 public class DocumentStoreRecordResponse
 {
diff --git a/src/Nexus.Crypto.SDK/Models/DocumentStoreSettings.cs b/src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreSettings.cs
similarity index 98%
rename from src/Nexus.Crypto.SDK/Models/DocumentStoreSettings.cs
rename to src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreSettings.cs
index d0d386e..f871b2b 100644
--- a/src/Nexus.Crypto.SDK/Models/DocumentStoreSettings.cs
+++ b/src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreSettings.cs
@@ -1,8 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
-
-namespace Nexus.Crypto.SDK.Models;
+namespace Nexus.Crypto.SDK.Models.DocumentStore;
 
 public class DocumentStoreSettingsRequest
 {
diff --git a/src/Nexus.Crypto.SDK/Models/DocumentStoreType.cs b/src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreType.cs
similarity index 97%
rename from src/Nexus.Crypto.SDK/Models/DocumentStoreType.cs
rename to src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreType.cs
index 7fa9c31..260d484 100644
--- a/src/Nexus.Crypto.SDK/Models/DocumentStoreType.cs
+++ b/src/Nexus.Crypto.SDK/Models/DocumentStore/DocumentStoreType.cs
@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Nexus.Crypto.SDK.Models;
-
+namespace Nexus.Crypto.SDK.Models.DocumentStore;
 
 public record DocumentStoreTypeResponse
 {
diff --git a/src/Nexus.Crypto.SDK/NexusAPIService.cs b/src/Nexus.Crypto.SDK/NexusAPIService.cs
index 604fa9e..01261c1 100644
--- a/src/Nexus.Crypto.SDK/NexusAPIService.cs
+++ b/src/Nexus.Crypto.SDK/NexusAPIService.cs
@@ -8,39 +8,39 @@
 namespace Nexus.Crypto.SDK;
 
 public class NexusAPIService(INexusApiClientFactory nexusApiClientFactory)
-    : BaseService(nexusApiClientFactory), INexusBrokerAPIService, INexusCustodianAPIService
+    : BaseService(nexusApiClientFactory),
+        INexusBrokerAPIService,
+        INexusCustodianAPIService
 {
-    public IDocumentStoreSettingsService DocumentStoreSettings { get; } = new DocumentStoreSettingsService(nexusApiClientFactory);
-    public IDocumentStoreTypeService DocumentStoreType { get; } = new DocumentStoreTypeService(nexusApiClientFactory);
-    public IDocumentStoreRecordService  DocumentStoreRecord { get; } = new DocumentStoreRecordService(nexusApiClientFactory);
-    public ICustomerService Customer { get; } = new CustomerService(nexusApiClientFactory);
-
-    public NexusAPIService AddHeader(string key, string value)
+    public new NexusAPIService AddHeader(string key, string value)
     {
-        _headers.Add(key, value);
+        base.AddHeader(key, value);
         return this;
     }
 
+    public IDocumentStoreService DocumentStore => new DocumentStoreService(this);
+    public ICustomerService Customer => new CustomerService(this);
+
     public async Task<CustomResultHolder<GetCurrencies>> GetCurrencies()
     {
-        return await GetAsync<CustomResultHolder<GetCurrencies>>("currencies", "1.2");
+        return await GetAsync<CustomResultHolder<GetCurrencies>>("currencies", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<GetPrices>> GetPrices(string currency)
     {
-        return await GetAsync<CustomResultHolder<GetPrices>>($"prices/{currency}", "1.2");
+        return await GetAsync<CustomResultHolder<GetPrices>>($"prices/{currency}", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<GetLabelPartner>> GetLabelPartner()
     {
-        return await GetAsync<CustomResultHolder<GetLabelPartner>>("labelpartner", "1.2");
+        return await GetAsync<CustomResultHolder<GetLabelPartner>>("labelpartner", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<GetReserves>> GetReserves(string? reservesTimeStamp = null)
     {
         return await GetAsync<CustomResultHolder<GetReserves>>(
             $"reserves?reservesTimeStamp={reservesTimeStamp}",
-            "1.2");
+            ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<GetBrokerBalances_1_1>> GetBrokerBalances()
@@ -55,7 +55,7 @@ public async Task<CustomResultHolder<GetBrokerBalances_1_1>> GetBrokerBalances()
 
     public async Task<CustomResultHolder<GetCustodianBalances>> GetCustodianBalances()
     {
-        return await GetAsync<CustomResultHolder<GetCustodianBalances>>("balances", "1.2");
+        return await GetAsync<CustomResultHolder<GetCustodianBalances>>("balances", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<PagedResult<GetBalanceMutation>>> GetBalanceMutations(
@@ -63,7 +63,7 @@ public async Task<CustomResultHolder<PagedResult<GetBalanceMutation>>> GetBalanc
     {
         return await GetAsync<CustomResultHolder<PagedResult<GetBalanceMutation>>>(
             $"balances/hotwallet/mutations{CreateUriQuery(queryParams)}",
-            "1.2");
+            ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<PagedResult<GetMail>>> GetMails(
@@ -71,38 +71,38 @@ public async Task<CustomResultHolder<PagedResult<GetMail>>> GetMails(
     {
         return await GetAsync<CustomResultHolder<PagedResult<GetMail>>>(
             $"mail{CreateUriQuery(queryParams)}",
-            "1.2");
+            ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<GetTransaction>> GetBrokerTransaction(string txCode)
     {
-        return await GetAsync<CustomResultHolder<GetTransaction>>($"transaction/{txCode}", "1.2");
+        return await GetAsync<CustomResultHolder<GetTransaction>>($"transaction/{txCode}", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<PagedResult<GetTransaction>>> GetBrokerTransactions(
         Dictionary<string, string> queryParams)
     {
         return await GetAsync<CustomResultHolder<PagedResult<GetTransaction>>>(
-            $"transaction{CreateUriQuery(queryParams)}", "1.2");
+            $"transaction{CreateUriQuery(queryParams)}", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<TotalsResult<TransactionTotals>>> GetBrokerTransactionTotals(
         Dictionary<string, string> queryParams)
     {
         return await GetAsync<CustomResultHolder<TotalsResult<TransactionTotals>>>(
-            $"transaction/totals{CreateUriQuery(queryParams)}", "1.2");
+            $"transaction/totals{CreateUriQuery(queryParams)}", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<PagedResult<GetTransfer>>> GetTransfers(GetTransfersRequest? request = null)
     {
         return await GetAsync<CustomResultHolder<PagedResult<GetTransfer>>>(
-            $"/transfers?{QueryParameterHelper.ToQueryString(request)}", "1.2");
+            $"/transfers?{QueryParameterHelper.ToQueryString(request)}", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<PagedResult<ListOrder>>> GetOrders(GetOrdersRequest? request = null)
     {
         return await GetAsync<CustomResultHolder<PagedResult<ListOrder>>>(
-            $"/orders?{QueryParameterHelper.ToQueryString(request)}", "1.2");
+            $"/orders?{QueryParameterHelper.ToQueryString(request)}", ApiVersion1_2);
     }
 
     public async Task<IEnumerable<ChartSeriesModelPT>> GetMinutePrices(int timeSpan, string currencyCode,
@@ -118,44 +118,46 @@ public async Task<CustomResultHolder<PagedResult<TransactionNotificationCallback
     {
         return await GetAsync<CustomResultHolder<PagedResult<TransactionNotificationCallbackResponse>>>(
             $"transaction/{transactionCode}/callbacks",
-            "1.2");
+            ApiVersion1_2);
     }
 
     public Task<CustomResultHolder<ListCustodianTransactionResponse>> GetCustodianTransaction(string txCode)
     {
         return GetAsync<CustomResultHolder<ListCustodianTransactionResponse>>(
             $"transactions/custodian/{txCode}",
-            "1.2");
+            ApiVersion1_2);
     }
 
     public Task<CustomResultHolder<CustodianCancelResponse>> CancelCustodianTransaction(string txCode)
     {
         return PostAsync<CustomResultHolder<CustodianCancelResponse>>(
             $"transactions/custodian/{txCode}/cancel",
-            "1.2");
+            ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<List<GetPortfolio>>> GetPortfolios()
     {
-        return await GetAsync<CustomResultHolder<List<GetPortfolio>>>("portfolios", "1.2");
+        return await GetAsync<CustomResultHolder<List<GetPortfolio>>>("portfolios", ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<PagedResult<GetTrustLevel>>> GetTrustLevels()
     {
-        return await GetAsync<CustomResultHolder<PagedResult<GetTrustLevel>>>("labelpartner/trustlevels", "1.2");
+        return await GetAsync<CustomResultHolder<PagedResult<GetTrustLevel>>>("labelpartner/trustlevels", ApiVersion1_2);
     }
 
-    public async Task<CustomResultHolder<PagedResult<CustomerBankAccountResponse>>> GetCustomerBankAccounts(string customerCode, Dictionary<string, string> queryParams)
+    public async Task<CustomResultHolder<PagedResult<CustomerBankAccountResponse>>> GetCustomerBankAccounts(
+        string customerCode, Dictionary<string, string> queryParams)
     {
-        return  await GetAsync<CustomResultHolder<PagedResult<CustomerBankAccountResponse>>>(
+        return await GetAsync<CustomResultHolder<PagedResult<CustomerBankAccountResponse>>>(
             $"customer/{customerCode}/bankaccounts{CreateUriQuery(queryParams)}",
-            "1.2");
+            ApiVersion1_2);
     }
 
-    public async Task<CustomResultHolder<CustomerBankAccountResponse>> CreateCustomerBankAccount(string customerCode, CreateBankAccountRequestModel request)
+    public async Task<CustomResultHolder<CustomerBankAccountResponse>> CreateCustomerBankAccount(string customerCode,
+        CreateBankAccountRequestModel request)
     {
         return await PostAsync<CreateBankAccountRequestModel, CustomResultHolder<CustomerBankAccountResponse>>(
-            $"customer/{customerCode}/bankaccounts", request, "1.2");
+            $"customer/{customerCode}/bankaccounts", request, ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<CustomerBankAccountResponse>> UpdateCustomerBankAccount(string customerCode,
@@ -164,7 +166,7 @@ public async Task<CustomResultHolder<CustomerBankAccountResponse>> UpdateCustome
         return await PutAsync<UpdateBankAccountRequest, CustomResultHolder<CustomerBankAccountResponse>>(
             $"customer/{customerCode}/bankaccounts/{bankAccountId}",
             request,
-            "1.2"
+            ApiVersion1_2
         );
     }
 
@@ -172,6 +174,6 @@ public Task DeleteCustomerBankAccount(string customerCode, Guid bankAccountId)
     {
         return DeleteAsync(
             $"customer/{customerCode}/bankAccounts/{bankAccountId}",
-            "1.2");
+            ApiVersion1_2);
     }
 }
\ No newline at end of file
diff --git a/src/Nexus.Crypto.SDK/Services/BaseService.cs b/src/Nexus.Crypto.SDK/Services/BaseService.cs
index 1208d42..2cd6885 100644
--- a/src/Nexus.Crypto.SDK/Services/BaseService.cs
+++ b/src/Nexus.Crypto.SDK/Services/BaseService.cs
@@ -8,14 +8,20 @@ namespace Nexus.Crypto.SDK.Services;
 
 public class BaseService(INexusApiClientFactory nexusApiClientFactory): IHttpService
 {
-    protected const string ISO8601DateTimeFormat = "yyyy-MM-ddTHH:mm:ssZ";
-    protected const string ApiVersion = "1.2";
-    protected readonly Dictionary<string, string> _headers = [];
+    public const string ApiVersion1_2 = "1.2";
+    public const string ISO8601DateTimeFormat = "yyyy-MM-ddTHH:mm:ssZ";
+    
+    private readonly Dictionary<string, string> _headers = [];
 
-    protected readonly JsonSerializerOptions _serializerOptions = new()
+    private readonly JsonSerializerOptions _serializerOptions = new()
     {
         Converters = { new JsonStringEnumConverter() }, PropertyNameCaseInsensitive = true
     };
+    
+    public void AddHeader(string key, string value)
+    {
+        _headers.Add(key, value);
+    }
 
     private static async Task HandleErrorResponse<T>(HttpResponseMessage response)
     {
@@ -31,7 +37,7 @@ private static async Task HandleErrorResponse<T>(HttpResponseMessage response)
         throw exception;
     }
 
-    protected async Task<HttpClient> GetApiClient(string apiVersion)
+    private async Task<HttpClient> GetApiClient(string apiVersion)
     {
         var client = await nexusApiClientFactory.GetClient(apiVersion);
 
@@ -153,7 +159,7 @@ public async Task<TResponse> DeleteAsync<TResponse>(string endPoint, string apiV
     /// </summary>
     /// <param name="queryParams"></param>
     /// <returns></returns>
-    protected static string CreateUriQuery(Dictionary<string, string> queryParams)
+    public static string CreateUriQuery(Dictionary<string, string> queryParams)
     {
         var query = string.Empty;
 
diff --git a/src/Nexus.Crypto.SDK/Services/CustomerService.cs b/src/Nexus.Crypto.SDK/Services/CustomerService.cs
index ac66367..ad257f0 100644
--- a/src/Nexus.Crypto.SDK/Services/CustomerService.cs
+++ b/src/Nexus.Crypto.SDK/Services/CustomerService.cs
@@ -3,56 +3,58 @@
 
 namespace Nexus.Crypto.SDK.Services;
 
-public class CustomerService(INexusApiClientFactory nexusApiClientFactory) :BaseService(nexusApiClientFactory), ICustomerService
+public class CustomerService(BaseService service) : ICustomerService
 {
     public Task<CustomResultHolder<GetCustomerTraceSummary[]>> GetCustomerTraceSummary(string customerCode,
         DateTime startDate)
     {
-        return GetAsync<CustomResultHolder<GetCustomerTraceSummary[]>>(
-            $"customer/{customerCode}/trace/summary?startDate={startDate.ToString(ISO8601DateTimeFormat)}",
-            ApiVersion);
+        return service.GetAsync<CustomResultHolder<GetCustomerTraceSummary[]>>(
+            $"customer/{customerCode}/trace/summary?startDate={startDate.ToString(BaseService.ISO8601DateTimeFormat)}",
+            BaseService.ApiVersion1_2);
     }
 
     public Task<CustomResultHolder<PagedResult<GetCustomerTrace>>> GetCustomerTraces(string customerCode,
         DateTime startDate)
     {
-        return GetAsync<CustomResultHolder<PagedResult<GetCustomerTrace>>>(
-            $"customer/{customerCode}/trace?startDate={startDate.ToString(ISO8601DateTimeFormat)}",
-            ApiVersion);
+        return service.GetAsync<CustomResultHolder<PagedResult<GetCustomerTrace>>>(
+            $"customer/{customerCode}/trace?startDate={startDate.ToString(BaseService.ISO8601DateTimeFormat)}",
+            BaseService.ApiVersion1_2);
     }
-    
+
     public async Task<CustomResultHolder<GetCustomer>> GetCustomer(string customerCode)
     {
-        return await GetAsync<CustomResultHolder<GetCustomer>>($"customer/{customerCode}", ApiVersion);
+        return await service.GetAsync<CustomResultHolder<GetCustomer>>($"customer/{customerCode}",
+            BaseService.ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<PagedResult<GetCustomer>>> GetCustomers(Dictionary<string, string> queryParams)
     {
-        return await GetAsync<CustomResultHolder<PagedResult<GetCustomer>>>(
-            $"customer{CreateUriQuery(queryParams)}",
-            ApiVersion);
+        return await service.GetAsync<CustomResultHolder<PagedResult<GetCustomer>>>(
+            $"customer{BaseService.CreateUriQuery(queryParams)}",
+            BaseService.ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<CreateCustomerResponse>> CreateCustomer(CreateCustomerRequest request)
     {
-        return await PostAsync<CreateCustomerRequest, CustomResultHolder<CreateCustomerResponse>>(
+        return await service.PostAsync<CreateCustomerRequest, CustomResultHolder<CreateCustomerResponse>>(
             "customer",
             request,
-            ApiVersion
+            BaseService.ApiVersion1_2
         );
     }
 
     public async Task<CustomResultHolder<DeleteCustomerResponse>> DeleteCustomer(string customerCode)
     {
-        return await DeleteAsync<CustomResultHolder<DeleteCustomerResponse>>($"customer/{customerCode}", ApiVersion);
+        return await service.DeleteAsync<CustomResultHolder<DeleteCustomerResponse>>($"customer/{customerCode}",
+            BaseService.ApiVersion1_2);
     }
 
     public async Task<CustomResultHolder<GetCustomer>> UpdateCustomer(string customerCode,
         UpdateCustomerRequest request)
     {
-        return await PutAsync<UpdateCustomerRequest, CustomResultHolder<GetCustomer>>(
+        return await service.PutAsync<UpdateCustomerRequest, CustomResultHolder<GetCustomer>>(
             $"customer/{customerCode}",
             request,
-            ApiVersion);
+            BaseService.ApiVersion1_2);
     }
 }
\ No newline at end of file
diff --git a/src/Nexus.Crypto.SDK/Services/DocumentStoreRecordService.cs b/src/Nexus.Crypto.SDK/Services/DocumentStoreRecordService.cs
index af7d48a..42bf5ae 100644
--- a/src/Nexus.Crypto.SDK/Services/DocumentStoreRecordService.cs
+++ b/src/Nexus.Crypto.SDK/Services/DocumentStoreRecordService.cs
@@ -1,16 +1,17 @@
-using Nexus.Crypto.SDK.Models;
+using Nexus.Crypto.SDK.Models.DocumentStore;
 using Nexus.Crypto.SDK.Models.Response;
 
 namespace Nexus.Crypto.SDK.Services;
 
-public class DocumentStoreRecordService(INexusApiClientFactory nexusApiClientFactory) : BaseService(nexusApiClientFactory), IDocumentStoreRecordService
+public class DocumentStoreRecordService(BaseService service) : IDocumentStoreRecordService
 {
     private const string DocumentStoreRecordUrl = "integrations/documentstore/file";
     private const string DocumentStoreRecordListUrl = "integrations/documentstore/list";
+
     public async Task<CustomResultHolder<DocumentStoreRecordResponse>> Create(FileUploadRequest request)
     {
         using var formContent = new MultipartFormDataContent();
-        
+
         // Add file content as stream content to avoid loading the entire file into memory
         using var fileContent = new StreamContent(request.FileContent);
         formContent.Add(fileContent, "file", request.FileName);
@@ -28,32 +29,36 @@ public async Task<CustomResultHolder<DocumentStoreRecordResponse>> Create(FileUp
         if (!string.IsNullOrEmpty(request.ItemReference))
             formContent.Add(new StringContent(request.ItemReference), "itemReference");
 
-        return await PostAsync<CustomResultHolder<DocumentStoreRecordResponse>>(DocumentStoreRecordUrl, formContent, ApiVersion);
+        return await service.PostAsync<CustomResultHolder<DocumentStoreRecordResponse>>(DocumentStoreRecordUrl,
+            formContent,
+            BaseService.ApiVersion1_2);
     }
 
     public Task<Stream> GetDocument(string filePath)
     {
         var url = $"{DocumentStoreRecordUrl}?filePath={filePath}";
-        return GetStream(url, ApiVersion);
+        return service.GetStream(url, BaseService.ApiVersion1_2);
     }
 
-    public Task<CustomResultHolder<PagedResult<DocumentStoreRecordResponse>>> Get(string customerCode, Dictionary<string, string> queryParams)
+    public Task<CustomResultHolder<PagedResult<DocumentStoreRecordResponse>>> Get(string customerCode,
+        Dictionary<string, string> queryParams)
     {
         queryParams["customerCode"] = customerCode;
 
-        var url = DocumentStoreRecordListUrl + CreateUriQuery(queryParams);
-        return GetAsync<CustomResultHolder<PagedResult<DocumentStoreRecordResponse>>>(url, ApiVersion);
+        var url = DocumentStoreRecordListUrl + BaseService.CreateUriQuery(queryParams);
+        return service.GetAsync<CustomResultHolder<PagedResult<DocumentStoreRecordResponse>>>(url,
+            BaseService.ApiVersion1_2);
     }
 
     public Task<CustomResultHolder<DocumentStoreRecordResponse>> Update(FileUpdateRequest request)
     {
-        return PutAsync<FileUpdateRequest, CustomResultHolder<DocumentStoreRecordResponse>>(
-            DocumentStoreRecordUrl, request, ApiVersion);
+        return service.PutAsync<FileUpdateRequest, CustomResultHolder<DocumentStoreRecordResponse>>(
+            DocumentStoreRecordUrl, request, BaseService.ApiVersion1_2);
     }
 
     public Task Delete(string filePath)
     {
         var url = $"{DocumentStoreRecordUrl}?filePath={filePath}";
-        return DeleteAsync(url, ApiVersion);
+        return service.DeleteAsync(url, BaseService.ApiVersion1_2);
     }
 }
\ No newline at end of file
diff --git a/src/Nexus.Crypto.SDK/Services/DocumentStoreService.cs b/src/Nexus.Crypto.SDK/Services/DocumentStoreService.cs
new file mode 100644
index 0000000..42def83
--- /dev/null
+++ b/src/Nexus.Crypto.SDK/Services/DocumentStoreService.cs
@@ -0,0 +1,12 @@
+namespace Nexus.Crypto.SDK.Services;
+
+public class DocumentStoreService(BaseService service) : IDocumentStoreService
+{
+    private readonly IDocumentStoreTypeService _types = new DocumentStoreTypeService(service);
+    private readonly IDocumentStoreSettingsService _settings = new DocumentStoreSettingsService(service);
+    private readonly IDocumentStoreRecordService _records = new DocumentStoreRecordService(service);
+
+    public IDocumentStoreTypeService Types => _types;
+    public IDocumentStoreSettingsService Settings => _settings;
+    public IDocumentStoreRecordService Records => _records;
+}
\ No newline at end of file
diff --git a/src/Nexus.Crypto.SDK/Services/DocumentStoreSettingsService.cs b/src/Nexus.Crypto.SDK/Services/DocumentStoreSettingsService.cs
index da3833c..199ffeb 100644
--- a/src/Nexus.Crypto.SDK/Services/DocumentStoreSettingsService.cs
+++ b/src/Nexus.Crypto.SDK/Services/DocumentStoreSettingsService.cs
@@ -1,18 +1,20 @@
-using Nexus.Crypto.SDK.Models;
+using Nexus.Crypto.SDK.Models.DocumentStore;
 using Nexus.Crypto.SDK.Models.Response;
 
 namespace Nexus.Crypto.SDK.Services;
 
-public class DocumentStoreSettingsService(INexusApiClientFactory nexusApiClientFactory): BaseService(nexusApiClientFactory), IDocumentStoreSettingsService
+public class DocumentStoreSettingsService(BaseService service) : IDocumentStoreSettingsService
 {
     private const string documentStoreUrl = "integrations/documentstore";
+
     /// <summary>
     /// Retrieve the Document Store settings
     /// </summary>
     /// <returns></returns>
     public Task<CustomResultHolder<DocumentStoreSettingsResponse>> Get()
     {
-        return GetAsync<CustomResultHolder<DocumentStoreSettingsResponse>>(documentStoreUrl, ApiVersion);
+        return service.GetAsync<CustomResultHolder<DocumentStoreSettingsResponse>>(documentStoreUrl,
+            BaseService.ApiVersion1_2);
     }
 
     /// <summary>
@@ -20,12 +22,13 @@ public Task<CustomResultHolder<DocumentStoreSettingsResponse>> Get()
     /// </summary>
     /// <param name="documentStoreSettings"></param>
     /// <returns></returns>
-    public Task<CustomResultHolder<DocumentStoreSettingsResponse>> Create(DocumentStoreSettingsRequest documentStoreSettings)
+    public Task<CustomResultHolder<DocumentStoreSettingsResponse>> Create(
+        DocumentStoreSettingsRequest documentStoreSettings)
     {
-        return PostAsync<DocumentStoreSettingsRequest, CustomResultHolder<DocumentStoreSettingsResponse>>(
+        return service.PostAsync<DocumentStoreSettingsRequest, CustomResultHolder<DocumentStoreSettingsResponse>>(
             documentStoreUrl,
             documentStoreSettings,
-            ApiVersion);
+            BaseService.ApiVersion1_2);
     }
 
     /// <summary>
@@ -35,10 +38,10 @@ public Task<CustomResultHolder<DocumentStoreSettingsResponse>> Create(DocumentSt
     /// <returns></returns>
     public Task<CustomResultHolder> Update(DocumentStoreSettingsRequest documentStoreSettings)
     {
-        return PutAsync<DocumentStoreSettingsRequest, CustomResultHolder>(
+        return service.PutAsync<DocumentStoreSettingsRequest, CustomResultHolder>(
             documentStoreUrl,
             documentStoreSettings,
-            ApiVersion);
+            BaseService.ApiVersion1_2);
     }
 
     /// <summary>
@@ -47,6 +50,6 @@ public Task<CustomResultHolder> Update(DocumentStoreSettingsRequest documentStor
     /// <returns></returns>
     public Task Delete()
     {
-        return DeleteAsync(documentStoreUrl, ApiVersion);
+        return service.DeleteAsync(documentStoreUrl, BaseService.ApiVersion1_2);
     }
 }
\ No newline at end of file
diff --git a/src/Nexus.Crypto.SDK/Services/DocumentStoreTypeService.cs b/src/Nexus.Crypto.SDK/Services/DocumentStoreTypeService.cs
index f92fda9..52d41f6 100644
--- a/src/Nexus.Crypto.SDK/Services/DocumentStoreTypeService.cs
+++ b/src/Nexus.Crypto.SDK/Services/DocumentStoreTypeService.cs
@@ -1,39 +1,39 @@
-using Nexus.Crypto.SDK.Models;
+using Nexus.Crypto.SDK.Models.DocumentStore;
 using Nexus.Crypto.SDK.Models.Response;
 
 namespace Nexus.Crypto.SDK.Services;
 
-public class DocumentStoreTypeService(INexusApiClientFactory nexusApiClientFactory) : BaseService(nexusApiClientFactory), IDocumentStoreTypeService
+public class DocumentStoreTypeService(BaseService service) : IDocumentStoreTypeService
 {
     private const string DocumentTypeUrl = "integrations/documentstore/type";
     public Task<CustomResultHolder<DocumentStoreTypeResponse>> Create(DocumentStoreTypeCreateRequest request)
     {
-        return PostAsync<DocumentStoreTypeCreateRequest, CustomResultHolder<DocumentStoreTypeResponse>>(
-            DocumentTypeUrl, request, ApiVersion);
+        return service.PostAsync<DocumentStoreTypeCreateRequest, CustomResultHolder<DocumentStoreTypeResponse>>(
+            DocumentTypeUrl, request, BaseService.ApiVersion1_2);
     }
 
     public Task Delete(string documentTypeCode)
     {
         var url = $"{DocumentTypeUrl}/{documentTypeCode}";
-        return DeleteAsync(url, ApiVersion);
+        return service.DeleteAsync(url, BaseService.ApiVersion1_2);
     }
 
     public Task<CustomResultHolder<DocumentStoreTypeResponse>> GetByCode(string documentTypeCode)
     {
         var url = $"{DocumentTypeUrl}/{documentTypeCode}";
-        return GetAsync<CustomResultHolder<DocumentStoreTypeResponse>>(url, ApiVersion);
+        return service.GetAsync<CustomResultHolder<DocumentStoreTypeResponse>>(url, BaseService.ApiVersion1_2);
     }
 
     public Task<CustomResultHolder<PagedResult<DocumentStoreTypeResponse>>> Get(Dictionary<string, string> queryParams)
     {
-        var url = DocumentTypeUrl + CreateUriQuery(queryParams);
-        return GetAsync<CustomResultHolder<PagedResult<DocumentStoreTypeResponse>>>(url, ApiVersion);
+        var url = DocumentTypeUrl + BaseService.CreateUriQuery(queryParams);
+        return service.GetAsync<CustomResultHolder<PagedResult<DocumentStoreTypeResponse>>>(url, BaseService.ApiVersion1_2);
     }
 
     public Task<CustomResultHolder<DocumentStoreTypeResponse>> Update(string documentTypeCode, DocumentStoreTypeUpdateRequest request)
     {
         var url = $"{DocumentTypeUrl}/{documentTypeCode}";
-        return PutAsync<DocumentStoreTypeUpdateRequest, CustomResultHolder<DocumentStoreTypeResponse>>(
-            url, request, ApiVersion);
+        return service.PutAsync<DocumentStoreTypeUpdateRequest, CustomResultHolder<DocumentStoreTypeResponse>>(
+            url, request, BaseService.ApiVersion1_2);
     }
 }
\ No newline at end of file
diff --git a/src/Nexus.Crypto.SDK/Services/IDocumentStoreRecordService.cs b/src/Nexus.Crypto.SDK/Services/IDocumentStoreRecordService.cs
index bd23480..7819e73 100644
--- a/src/Nexus.Crypto.SDK/Services/IDocumentStoreRecordService.cs
+++ b/src/Nexus.Crypto.SDK/Services/IDocumentStoreRecordService.cs
@@ -1,4 +1,4 @@
-using Nexus.Crypto.SDK.Models;
+using Nexus.Crypto.SDK.Models.DocumentStore;
 using Nexus.Crypto.SDK.Models.Response;
 
 namespace Nexus.Crypto.SDK.Services;
diff --git a/src/Nexus.Crypto.SDK/Services/IDocumentStoreService.cs b/src/Nexus.Crypto.SDK/Services/IDocumentStoreService.cs
new file mode 100644
index 0000000..57f677e
--- /dev/null
+++ b/src/Nexus.Crypto.SDK/Services/IDocumentStoreService.cs
@@ -0,0 +1,8 @@
+namespace Nexus.Crypto.SDK.Services;
+
+public interface IDocumentStoreService
+{
+    IDocumentStoreTypeService Types { get; }
+    IDocumentStoreSettingsService Settings { get; }
+    IDocumentStoreRecordService Records { get; }
+}
\ No newline at end of file
diff --git a/src/Nexus.Crypto.SDK/Services/IDocumentStoreSettingsService.cs b/src/Nexus.Crypto.SDK/Services/IDocumentStoreSettingsService.cs
index 9112213..50aeb5b 100644
--- a/src/Nexus.Crypto.SDK/Services/IDocumentStoreSettingsService.cs
+++ b/src/Nexus.Crypto.SDK/Services/IDocumentStoreSettingsService.cs
@@ -1,4 +1,5 @@
 using Nexus.Crypto.SDK.Models;
+using Nexus.Crypto.SDK.Models.DocumentStore;
 using Nexus.Crypto.SDK.Models.Response;
 
 namespace Nexus.Crypto.SDK.Services;
diff --git a/src/Nexus.Crypto.SDK/Services/IDocumentStoreTypeService.cs b/src/Nexus.Crypto.SDK/Services/IDocumentStoreTypeService.cs
index 60c483f..fc08f9e 100644
--- a/src/Nexus.Crypto.SDK/Services/IDocumentStoreTypeService.cs
+++ b/src/Nexus.Crypto.SDK/Services/IDocumentStoreTypeService.cs
@@ -1,4 +1,4 @@
-using Nexus.Crypto.SDK.Models;
+using Nexus.Crypto.SDK.Models.DocumentStore;
 using Nexus.Crypto.SDK.Models.Response;
 
 namespace Nexus.Crypto.SDK.Services;