diff --git a/commerce/RELEASES.md b/commerce/RELEASES.md
index 4166df8ab..5a16d8ec2 100644
--- a/commerce/RELEASES.md
+++ b/commerce/RELEASES.md
@@ -454,4 +454,20 @@ Based on:
 - OpenAPI Doc 2.1.0 https://raw.githubusercontent.com/codatio/oas/main/yaml/Codat-Commerce.yaml
 - Speakeasy CLI 1.40.3 (2.34.7) https://github.com/speakeasy-api/speakeasy
 ### Releases
-- [PyPI v0.23.1] https://pypi.org/project/codat-commerce/0.23.1 - commerce
\ No newline at end of file
+- [PyPI v0.23.1] https://pypi.org/project/codat-commerce/0.23.1 - commerce
+
+## 2023-06-03 00:20:34
+### Changes
+Based on:
+- OpenAPI Doc 2.1.0 https://raw.githubusercontent.com/codatio/oas/main/yaml/Codat-Commerce.yaml
+- Speakeasy CLI 1.43.0 (2.35.3) https://github.com/speakeasy-api/speakeasy
+### Releases
+- [PyPI v0.24.0] https://pypi.org/project/codat-commerce/0.24.0 - commerce
+
+## 2023-06-06 20:44:51
+### Changes
+Based on:
+- OpenAPI Doc 2.1.0 https://raw.githubusercontent.com/codatio/oas/main/yaml/Codat-Commerce.yaml
+- Speakeasy CLI 1.44.2 (2.35.9) https://github.com/speakeasy-api/speakeasy
+### Releases
+- [PyPI v0.24.1] https://pypi.org/project/codat-commerce/0.24.1 - commerce
\ No newline at end of file
diff --git a/commerce/files.gen b/commerce/files.gen
index e4e095162..cfc3c0f73 100755
--- a/commerce/files.gen
+++ b/commerce/files.gen
@@ -1,3 +1,4 @@
+src/codatcommerce/sdkconfiguration.py
 src/codatcommerce/company_info.py
 src/codatcommerce/customers.py
 src/codatcommerce/disputes.py
diff --git a/commerce/gen.yaml b/commerce/gen.yaml
index fa81dec53..64648840c 100644
--- a/commerce/gen.yaml
+++ b/commerce/gen.yaml
@@ -2,14 +2,14 @@ configVersion: 1.0.0
 management:
   docChecksum: 96e9b4568ed0b31c46843431d13e7366
   docVersion: 2.1.0
-  speakeasyVersion: 1.40.3
-  generationVersion: 2.34.7
+  speakeasyVersion: 1.44.2
+  generationVersion: 2.35.9
 generation:
   sdkClassName: CodatCommerce
   singleTagPerOp: false
   telemetryEnabled: true
 python:
-  version: 0.23.1
+  version: 0.24.1
   author: Speakeasy
   description: Python Client SDK Generated by Speakeasy
   maxMethodParams: 0
diff --git a/commerce/setup.py b/commerce/setup.py
index 00314d53d..559aadcc2 100755
--- a/commerce/setup.py
+++ b/commerce/setup.py
@@ -10,7 +10,7 @@
 
 setuptools.setup(
     name="codat-commerce",
-    version="0.23.1",
+    version="0.24.1",
     author="Speakeasy",
     description="Python Client SDK Generated by Speakeasy",
     long_description=long_description,
diff --git a/commerce/src/codatcommerce/__init__.py b/commerce/src/codatcommerce/__init__.py
index b9e232018..e6c0deeb6 100755
--- a/commerce/src/codatcommerce/__init__.py
+++ b/commerce/src/codatcommerce/__init__.py
@@ -1,3 +1,4 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
 from .sdk import *
+from .sdkconfiguration import *
diff --git a/commerce/src/codatcommerce/company_info.py b/commerce/src/codatcommerce/company_info.py
index ff370a1a9..a395cbebd 100755
--- a/commerce/src/codatcommerce/company_info.py
+++ b/commerce/src/codatcommerce/company_info.py
@@ -1,26 +1,16 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class CompanyInfo:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
+    sdk_configuration: SDKConfiguration
 
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetCompanyInfoRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetCompanyInfoResponse:
@@ -29,14 +19,14 @@ def get(self, request: operations.GetCompanyInfoRequest, retries: Optional[utils
         
         This may include information like addresses, tax registration details and social media or website information.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetCompanyInfoRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-info', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
diff --git a/commerce/src/codatcommerce/customers.py b/commerce/src/codatcommerce/customers.py
index 912342dc8..d593b3ed5 100755
--- a/commerce/src/codatcommerce/customers.py
+++ b/commerce/src/codatcommerce/customers.py
@@ -1,40 +1,30 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class Customers:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
+    sdk_configuration: SDKConfiguration
 
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetCustomerRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetCustomerResponse:
         r"""Get customer
         Get a specific commerce customer for the given company and data connection.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetCustomerRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-customers/{customerId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -74,15 +64,15 @@ def list(self, request: operations.ListCustomersRequest, retries: Optional[utils
         r"""List customers
         List all commerce customers for the given company and data connection
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListCustomersRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-customers', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListCustomersRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
diff --git a/commerce/src/codatcommerce/disputes.py b/commerce/src/codatcommerce/disputes.py
index 8c7b95b2c..e30a717f1 100755
--- a/commerce/src/codatcommerce/disputes.py
+++ b/commerce/src/codatcommerce/disputes.py
@@ -1,40 +1,30 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class Disputes:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
+    sdk_configuration: SDKConfiguration
 
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetDisputeRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetDisputeResponse:
         r"""Get dispute
         Get a specific commerce dispute.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetDisputeRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-disputes/{disputeId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -74,15 +64,15 @@ def list(self, request: operations.ListDisputesRequest, retries: Optional[utils.
         r"""List disputes
         List commerce disputes
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListDisputesRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-disputes', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListDisputesRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
diff --git a/commerce/src/codatcommerce/locations.py b/commerce/src/codatcommerce/locations.py
index 0cdab3a5d..528a1361d 100755
--- a/commerce/src/codatcommerce/locations.py
+++ b/commerce/src/codatcommerce/locations.py
@@ -1,26 +1,16 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class Locations:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
+    sdk_configuration: SDKConfiguration
 
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetLocationRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetLocationResponse:
@@ -29,14 +19,14 @@ def get(self, request: operations.GetLocationRequest, retries: Optional[utils.Re
         
         A `location` is a geographic place at which stocks of products may be held, or from where orders were placed.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetLocationRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-locations/{locationId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -78,14 +68,14 @@ def list(self, request: operations.ListLocationsRequest, retries: Optional[utils
         
         A `location` is a geographic place at which stocks of products may be held, or from where orders were placed.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListLocationsRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-locations', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
diff --git a/commerce/src/codatcommerce/orders.py b/commerce/src/codatcommerce/orders.py
index 03e536e88..51c5425e5 100755
--- a/commerce/src/codatcommerce/orders.py
+++ b/commerce/src/codatcommerce/orders.py
@@ -1,40 +1,30 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class Orders:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
+    sdk_configuration: SDKConfiguration
 
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetOrderRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetOrderResponse:
         r"""Get order
         Get a specific order placed or held on the linked commerce platform.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetOrderRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-orders/{orderId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -74,15 +64,15 @@ def list(self, request: operations.ListOrdersRequest, retries: Optional[utils.Re
         r"""List orders
         Get a list of orders placed or held on the linked commerce platform
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListOrdersRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-orders', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListOrdersRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
diff --git a/commerce/src/codatcommerce/payments.py b/commerce/src/codatcommerce/payments.py
index c939e7f97..43936bb26 100755
--- a/commerce/src/codatcommerce/payments.py
+++ b/commerce/src/codatcommerce/payments.py
@@ -1,40 +1,30 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class Payments:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
-
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    sdk_configuration: SDKConfiguration
+
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetPaymentRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetPaymentResponse:
         r"""Get payment
         Get a specific commerce payment for the given company & data connection.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetPaymentRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-payments/{paymentId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -74,14 +64,14 @@ def get_method(self, request: operations.GetPaymentMethodRequest, retries: Optio
         r"""Get payment method
         Retrieve a specific payment method, such as card, cash or other online payment methods, as held in the linked commerce platform.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetPaymentMethodRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-paymentMethods/{paymentMethodId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -121,15 +111,15 @@ def list(self, request: operations.ListPaymentsRequest, retries: Optional[utils.
         r"""List payments
         List commerce payments for the given company & data connection.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListPaymentsRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-payments', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListPaymentsRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -169,15 +159,15 @@ def list_methods(self, request: operations.ListPaymentMethodsRequest, retries: O
         r"""List payment methods
         Retrieve a list of payment methods, such as card, cash or other online payment methods, as held in the linked commerce platform.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListPaymentMethodsRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-paymentMethods', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListPaymentMethodsRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
diff --git a/commerce/src/codatcommerce/products.py b/commerce/src/codatcommerce/products.py
index ed255dedc..c33261875 100755
--- a/commerce/src/codatcommerce/products.py
+++ b/commerce/src/codatcommerce/products.py
@@ -1,40 +1,30 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class Products:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
-
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    sdk_configuration: SDKConfiguration
+
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetProductRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetProductResponse:
         r"""Get product
         The Products data type provides the company's product inventory, and includes the price and quantity of all products, and product variants, available for sale.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetProductRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-products/{productId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -74,14 +64,14 @@ def get_category(self, request: operations.GetProductCategoryRequest, retries: O
         r"""Get product category
         Product categories are used to classify a group of products together, either by type (e.g. \"Furniture\") or sometimes by tax profile.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetProductCategoryRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-productCategories/{productId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -121,15 +111,15 @@ def list(self, request: operations.ListProductsRequest, retries: Optional[utils.
         r"""List products
         The Products data type provides the company's product inventory, and includes the price and quantity of all products, and product variants, available for sale.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListProductsRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-products', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListProductsRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -169,15 +159,15 @@ def list_categories(self, request: operations.ListProductCategoriesRequest, retr
         r"""List product categories
         Product categories are used to classify a group of products together, either by type (eg \"Furniture\"), or sometimes by tax profile.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListProductCategoriesRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-productCategories', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListProductCategoriesRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
diff --git a/commerce/src/codatcommerce/sdk.py b/commerce/src/codatcommerce/sdk.py
index 3908b724c..a5b5d1096 100755
--- a/commerce/src/codatcommerce/sdk.py
+++ b/commerce/src/codatcommerce/sdk.py
@@ -1,7 +1,6 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
 import requests as requests_http
-from . import utils
 from .company_info import CompanyInfo
 from .customers import Customers
 from .disputes import Disputes
@@ -9,18 +8,14 @@
 from .orders import Orders
 from .payments import Payments
 from .products import Products
+from .sdkconfiguration import SDKConfiguration
 from .tax_components import TaxComponents
 from .transactions import Transactions
+from codatcommerce import utils
 from codatcommerce.models import shared
 
-SERVERS = [
-    "https://api.codat.io",
-    r"""Production"""
-]
-"""Contains the list of servers available to the SDK"""
-
 class CodatCommerce:
-    r"""Codat's standardized API for accessing commerce data
+    r"""Commerce API: Codat's standardized API for accessing commerce data
     Codat's Commerce API allows you to access standardised data from over 11 commerce and POS systems.
     
     Standardize how you connect to your customers’ payment, PoS, and eCommerce systems. Retrieve orders, payouts, payments, and product data in the same way for all the leading commerce platforms.
@@ -48,15 +43,11 @@ class CodatCommerce:
     transactions: Transactions
     r"""Retrieve standardized data from linked commerce platforms."""
 
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str = SERVERS[0]
-    _language: str = "python"
-    _sdk_version: str = "0.23.1"
-    _gen_version: str = "2.34.7"
+    sdk_configuration: SDKConfiguration
 
     def __init__(self,
                  security: shared.Security = None,
+                 server_idx: int = None,
                  server_url: str = None,
                  url_params: dict[str, str] = None,
                  client: requests_http.Session = None
@@ -65,6 +56,8 @@ def __init__(self,
         
         :param security: The security details required for authentication
         :type security: shared.Security
+        :param server_idx: The index of the server to use for all operations
+        :type server_idx: int
         :param server_url: The server URL to use for all operations
         :type server_url: str
         :param url_params: Parameters to optionally template the server URL with
@@ -72,103 +65,27 @@ def __init__(self,
         :param client: The requests.Session HTTP client to use for all operations
         :type client: requests_http.Session        
         """
-        self._client = requests_http.Session()
+        if client is None:
+            client = requests_http.Session()
         
+        security_client = utils.configure_security_client(client, security)
         
         if server_url is not None:
             if url_params is not None:
-                self._server_url = utils.template_url(server_url, url_params)
-            else:
-                self._server_url = server_url
-
-        if client is not None:
-            self._client = client
-        
-        self._security_client = utils.configure_security_client(self._client, security)
-        
+                server_url = utils.template_url(server_url, url_params)
 
+        self.sdk_configuration = SDKConfiguration(client, security_client, server_url, server_idx)
+       
         self._init_sdks()
     
     def _init_sdks(self):
-        self.company_info = CompanyInfo(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
-        self.customers = Customers(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
-        self.disputes = Disputes(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
-        self.locations = Locations(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
-        self.orders = Orders(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
-        self.payments = Payments(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
-        self.products = Products(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
-        self.tax_components = TaxComponents(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
-        self.transactions = Transactions(
-            self._client,
-            self._security_client,
-            self._server_url,
-            self._language,
-            self._sdk_version,
-            self._gen_version
-        )
-        
+        self.company_info = CompanyInfo(self.sdk_configuration)
+        self.customers = Customers(self.sdk_configuration)
+        self.disputes = Disputes(self.sdk_configuration)
+        self.locations = Locations(self.sdk_configuration)
+        self.orders = Orders(self.sdk_configuration)
+        self.payments = Payments(self.sdk_configuration)
+        self.products = Products(self.sdk_configuration)
+        self.tax_components = TaxComponents(self.sdk_configuration)
+        self.transactions = Transactions(self.sdk_configuration)
     
\ No newline at end of file
diff --git a/commerce/src/codatcommerce/sdkconfiguration.py b/commerce/src/codatcommerce/sdkconfiguration.py
new file mode 100755
index 000000000..db1ef08d8
--- /dev/null
+++ b/commerce/src/codatcommerce/sdkconfiguration.py
@@ -0,0 +1,29 @@
+"""Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
+
+import requests
+from dataclasses import dataclass
+
+
+SERVERS = [
+    'https://api.codat.io',
+    # Production
+]
+"""Contains the list of servers available to the SDK"""
+
+@dataclass
+class SDKConfiguration:
+    client: requests.Session
+    security_client: requests.Session
+    server_url: str = ''
+    server_idx: int = 0
+    language: str = 'python'
+    sdk_version: str = '0.24.1'
+    gen_version: str = '2.35.9'
+
+    def get_server_details(self) -> tuple[str, dict[str, str]]:
+        if self.server_url:
+            return self.server_url.removesuffix('/'), {}
+        if self.server_idx is None:
+            self.server_idx = 0
+
+        return SERVERS[self.server_idx], {}
diff --git a/commerce/src/codatcommerce/tax_components.py b/commerce/src/codatcommerce/tax_components.py
index 289274311..1477e1a78 100755
--- a/commerce/src/codatcommerce/tax_components.py
+++ b/commerce/src/codatcommerce/tax_components.py
@@ -1,40 +1,30 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class TaxComponents:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
+    sdk_configuration: SDKConfiguration
 
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetTaxComponentRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetTaxComponentResponse:
         r"""Get tax component
         This endpoint returns a specific tax rate from the commerce platform, including tax rate names and values. This supports the mapping of tax rates from the commerce platform to the accounting platform.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetTaxComponentRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-taxComponents/{taxId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -74,15 +64,15 @@ def list(self, request: operations.ListTaxComponentsRequest, retries: Optional[u
         r"""List tax components
         This endpoint returns a lists of tax rates from the commerce platform, including tax rate names and values. This supports the mapping of tax rates from the commerce platform to the accounting platform.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListTaxComponentsRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-taxComponents', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListTaxComponentsRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
diff --git a/commerce/src/codatcommerce/transactions.py b/commerce/src/codatcommerce/transactions.py
index 73242d316..aa410265b 100755
--- a/commerce/src/codatcommerce/transactions.py
+++ b/commerce/src/codatcommerce/transactions.py
@@ -1,40 +1,30 @@
 """Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT."""
 
-import requests as requests_http
-from . import utils
+from .sdkconfiguration import SDKConfiguration
+from codatcommerce import utils
 from codatcommerce.models import operations, shared
 from typing import Optional
 
 class Transactions:
     r"""Retrieve standardized data from linked commerce platforms."""
-    _client: requests_http.Session
-    _security_client: requests_http.Session
-    _server_url: str
-    _language: str
-    _sdk_version: str
-    _gen_version: str
+    sdk_configuration: SDKConfiguration
 
-    def __init__(self, client: requests_http.Session, security_client: requests_http.Session, server_url: str, language: str, sdk_version: str, gen_version: str) -> None:
-        self._client = client
-        self._security_client = security_client
-        self._server_url = server_url
-        self._language = language
-        self._sdk_version = sdk_version
-        self._gen_version = gen_version
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        self.sdk_configuration = sdk_config
         
     
     def get(self, request: operations.GetTransactionRequest, retries: Optional[utils.RetryConfig] = None) -> operations.GetTransactionResponse:
         r"""Get transaction
         Details of single financial transaction recorded in the commerce or point of sale system. For example, payments, service charges, and fees.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.GetTransactionRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-transactions/{transactionId}', request)
         headers = {}
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None:
@@ -74,15 +64,15 @@ def list(self, request: operations.ListTransactionsRequest, retries: Optional[ut
         r"""List transactions
         Details of all financial transactions recorded in the commerce or point of sale system are added to the Transactions data type. For example, payments, service charges, and fees.
         """
-        base_url = self._server_url
+        base_url = utils.template_url(*self.sdk_configuration.get_server_details())
         
         url = utils.generate_url(operations.ListTransactionsRequest, base_url, '/companies/{companyId}/connections/{connectionId}/data/commerce-transactions', request)
         headers = {}
         query_params = utils.get_query_params(operations.ListTransactionsRequest, request)
         headers['Accept'] = 'application/json;q=1, application/json;q=0.7, application/json;q=0'
-        headers['user-agent'] = f'speakeasy-sdk/{self._language} {self._sdk_version} {self._gen_version}'
+        headers['user-agent'] = f'speakeasy-sdk/{self.sdk_configuration.language} {self.sdk_configuration.sdk_version} {self.sdk_configuration.gen_version}'
         
-        client = self._security_client
+        client = self.sdk_configuration.security_client
         
         retry_config = retries
         if retry_config is None: